[Pkg-haskell-commits] [SCM] haskell-testpack branch, master, updated. debian/1.0.2-1-4-gb0d6b36

[John Goerzen]

The following commit has been merged in the master branch:
commit f1f4f694cfe1508563ed7899048cc80afd717941
Author: John Goerzen <jgoerzen at complete.org>
Date:   Thu May 12 21:42:16 2005 +0100

    Fix test-ghc6 to use new cabal test builder

diff --git a/Makefile b/Makefile
index 56b45db..d2b9556 100644
--- a/Makefile
+++ b/Makefile
@@ -45,17 +45,6 @@ doctmp/%.hs: %.lhs doctmp
 doctmp:
 	mkdir doctmp
 
-#libmissingH.a: $(OBJS)
-#	-rm -f libmissingH.a
-#	ar q libmissingH.a $(OBJS)
-
-#%.o: %.hs
-#	ghc -O2 -fallow-overlapping-instances -fallow-undecidable-instances -fglasgow-exts -ilibsrc --make `echo $< | sed -e s,libsrc/,, -e s,.hs$$,, -e s,/,.,g`
-#
-#%.o: %.lhs
-#	ghc -fallow-overlapping-instances -fallow-undecidable-instances -fglasgow-exts -ilibsrc --make `echo $< | sed -e s,libsrc/,, -e s,.lhs$$,, -e s,/,.,g`
-#
-
 .PHONY: doc
 doc: $(LHSCONVSOURCES) hugsbuild
 	-rm -rf html
@@ -81,20 +70,10 @@ local-pkg: all
 	cat .installed-pkg-config >> local-pkg
 	echo "]" >> local-pkg
 
-testsrc/runtests: local-pkg $(SOURCES) $(LHSSOURCES)
-	ghc6 -O2 -o testsrc/runtests -Ldist/build -odir dist/build \
-           -package-conf local-pkg \
-           -hidir dist/build -idist/build -itestsrc \
-	   -fallow-overlapping-instances -fglasgow-exts \
-	   -fallow-undecidable-instances \
-                -package HUnit -package MissingH --make testsrc/runtests.hs
-
-
-#testsrc/runtests: all $(shell find testsrc -name "*.hs")
-#	ghc6 -fallow-overlapping-instances -fallow-undecidable-instances -fglasgow-exts -package HUnit --make -o testsrc/runtests -itestsrc -ilibsrc testsrc/runtests.hs
+dist/build/testsrc/runtests: all
 
-test-ghc6: testsrc/runtests
-	testsrc/runtests 
+test-ghc6: dist/build/testsrc/runtests
+	dist/build/testsrc/runtests
 
 test-hugs: hugsbuild
 	runhugs -98 +o -P$(PWD)/dist/build:$(PWD)/testsrc: testsrc/runtests.hs

-- 
haskell-testpack