[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 bc6a5991214e0c1358821f74b25a34096efb63b0
Author: John Goerzen <jgoerzen at complete.org>
Date:   Fri May 13 01:20:43 2005 +0100

    checkpointing

diff --git a/Makefile b/Makefile
index d2b9556..7fe14f5 100644
--- a/Makefile
+++ b/Makefile
@@ -25,6 +25,7 @@ OBJS := $(O1:.lhs=.o)
 LHSCONVSOURCES := $(patsubst %.lhs,doctmp/%.hs,$(LHSSOURCES))
 HUGSCONVSOURCES := $(patsubst %.hs,dist/build/%.hs,$(SOURCES))
 UNLIT ?= $(shell ghc --print-libdir)/unlit
+GHCPARMS := -fallow-overlapping-instances -fallow-undecidable-instances -fglasgow-exts
 
 .PHONY: all hugsbuild
 all: setup			# GHC build
@@ -70,10 +71,11 @@ local-pkg: all
 	cat .installed-pkg-config >> local-pkg
 	echo "]" >> local-pkg
 
-dist/build/testsrc/runtests: all
+testsrc/runtests: all $(wildcard testsrc/*.hs) $(wildcard testsrc/*/*.hs) $(wildcard testsrc/*/*/*.hs)
+	cd testsrc && ghc --make -package HUnit $(GHCPARMS) -o runtests -L../dist/build -i../dist/build ../dist/build/libHS*.a runtests.hs
 
-test-ghc6: dist/build/testsrc/runtests
-	dist/build/testsrc/runtests
+test-ghc6: testsrc/runtests
+	testsrc/runtests
 
 test-hugs: hugsbuild
 	runhugs -98 +o -P$(PWD)/dist/build:$(PWD)/testsrc: testsrc/runtests.hs
@@ -82,7 +84,7 @@ interact-hugs:
 	hugs -98 +o -P$(PWD)/dist/build:
 
 interact-ghci: all
-	ghci -fallow-overlapping-instances -fallow-undecidable-instances -fglasgow-exts
+	ghci $(GHCPARMS)
 
 interact: interact-hugs
 
diff --git a/MissingH.cabal b/MissingH.cabal
index 17c66f6..3c97c9e 100644
--- a/MissingH.cabal
+++ b/MissingH.cabal
@@ -81,6 +81,7 @@ Build-Depends: haskell-src, network, unix, parsec, base, haskell98
 GHC-Options: -O2
 
 Executable: runtests
+Buildable: False
 Main-Is: runtests.hs
 HS-Source-Dir: testsrc
 Extensions: ExistentialQuantification, AllowOverlappingInstances,

-- 
haskell-testpack