[project @ 2002-01-29 11:03:21 by simonmar]

Tweaks to make the real suite run with GHCi.

real/HMMS/Makefile

@@ -53,10 +53,8 @@ HS_OBJS =   Alignments.o  	\
 	    Viterbi.o  		\
 	    BatchAlign.o
 
-SRC_RUNTEST_OPTS += -o2 HMMS.stderr hmms-data/h9 hmms-data/h9.ties hmms-data/h9.dgs sentences
+PROG_ARGS = hmms-data/h9 hmms-data/h9.ties hmms-data/h9.dgs sentences
 SRC_HC_OPTS += -fglasgow-exts -syslib util -cpp
-MaybeStateT_HC_OPTS += -cpp
-BatchAlign_HC_OPTS += -cpp
 
 OBJS_BatchTranscribe  =	BalBinSTrees.o	    \
 			Pronunciations.o    \

real/anna/Makefile

 TOP = ../..
 include $(TOP)/mk/boilerplate.mk
 
-SRC_RUNTEST_OPTS += \
-  -i big.cor
+STDIN_FILE = big.cor
 
 # don't: -poscript ./anna.postscript
 # This just sums the output to save including the entire output file

real/ebnf2ps/IOSupplement.hs

+{-# OPTIONS -cpp #-}
 --                            -*- Mode: Haskell -*- 
 -- Copyright 1994 by Peter Thiemann
 -- IOSupplement.hs --- some enhancements to the IO operations
@@ -9,6 +10,9 @@
 -- Status          : Unknown, Use with caution!
 -- 
 -- $Log: IOSupplement.hs,v $
+-- Revision 1.7  2002/01/29 11:03:21  simonmar
+-- Tweaks to make the real suite run with GHCi.
+--
 -- Revision 1.6  1999/01/18 19:38:46  sof
 -- Misc (backward compatible) changes to make srcs acceptable
 -- to a Haskell 98 compiler.

real/ebnf2ps/Makefile

@@ -2,8 +2,9 @@ TOP = ../..
 include $(TOP)/mk/boilerplate.mk
 
 SRC_HC_OPTS += -fglasgow-exts -package lang
-IOSupplement_HC_OPTS += -cpp
-SRC_RUNTEST_OPTS += ebnf2ps.stdin apat -o1 ebnf2ps.stdout
+
+PROG_ARGS = ebnf2ps.stdin apat
+STDIN_FILE = /dev/null
 
 # the default HS_SRCS doesn't include .ly files...
 HS_SRCS += HappyParser.hs

real/fulsom/Makefile

@@ -8,7 +8,7 @@ SRC_HC_OPTS += -cpp
 SRCS =  Csg.hs Fulsom.hs Interval.hs Kolor.hs Matrix.hs Oct.hs Patchlevel.hs \
 	Quad.hs Raster.hs Shapes.hs Types.hs Vector.hs
 
-SRC_RUNTEST_OPTS += 7
+PROG_ARGS = 7
 
 include $(TOP)/mk/target.mk
 

real/grep/Makefile

 TOP = ../..
 include $(TOP)/mk/boilerplate.mk
 
-SRC_RUNTEST_OPTS += grep.stdin apat
+PROG_ARGS = grep.stdin
 
 include $(TOP)/mk/target.mk
 

real/hidden/Makefile

@@ -2,7 +2,7 @@ TOP = ../..
 include $(TOP)/mk/boilerplate.mk
 
 SRC_RUNTEST_OPTS += +RTS -K1m -RTS
-SRC_RUNTEST_OPTS += -o1 hidden.stdout2 -o1 hidden.stdout3 objects/four.plate
+PROG_ARGS = objects/four.plate
 
 include $(TOP)/mk/target.mk
 

real/hpg/Makefile

 TOP = ../..
 include $(TOP)/mk/boilerplate.mk
 
-SRC_RUNTEST_OPTS += -RTS -nt 8 -dt 6 -nv 15 -dv 8 -de 8
+PROG_ARGS = -nt 8 -dt 6 -nv 15 -dv 8 -de 8
 
 include $(TOP)/mk/target.mk
 

real/mkhprog/Makefile

 TOP = ../..
 include $(TOP)/mk/boilerplate.mk
 
-SRC_RUNTEST_OPTS += -RTS -- -a Int -b Float -c Foo -d Bar -e Double \
+PROG_ARGS = -a Int -b Float -c Foo -d Bar -e Double \
   -f String -g String -h Int -j Double -k Bool -n Basil -p Knob -q Wizzle \
   -r Wissle -s Wibble -t Widdle -A Int -B Float -C Foo -D Bar -E Double \
   -F String -G String -H Int -I Float -J Double -K Bool -L Bool -M Buzzle \

real/parser/Makefile

@@ -2,6 +2,6 @@ TOP = ../..
 include $(TOP)/mk/boilerplate.mk
 
 HS_SRCS = Main.hs
-SRC_RUNTEST_OPTS += -i big_big_test.hs
+STDIN_FILE = big_big_test.hs
 
 include $(TOP)/mk/target.mk