cvs diff: bug fix for tests

[Tyson Richard DOWD]

And here are the new changes for the tests. 

===================================================================

Estimated hours taken: 6

Fix bugs in the scripts for running tests.

tests/handle_options:
	Quote EXTRA_CFLAGS and EXTRA_MCFLAGS so that we can use
	eval in runtests. 

tests/Mmake.common:
	Set MGNUCFLAGS using $(EXTRA_MGNUFLAGS) and $(EXTRA_CFLAGS)

tests/*/runtests:
	Don't pass empty strings as arguments to mmake, as this can
	tickle bugs in make.
	Try 
		make -f foo.123 ""
	on a CASE machine or hydra (not kryten, it has a different
	version of gnu-make). It will chop the `23' from that string.
	So when using `make -f mmake.$$', only the single digit pids 
	work, which is fairly limiting.

Index: tests/Mmake.common
===================================================================
RCS file: /home/staff/zs/imp/tests/Mmake.common,v
retrieving revision 1.4
diff -u -r1.4 Mmake.common
--- Mmake.common	1996/12/19 03:43:48	1.4
+++ Mmake.common	1997/03/17 07:21:52
@@ -1,6 +1,6 @@
 #-----------------------------------------------------------------------------#
 
-MGNUCFLAGS=-g
+MGNUCFLAGS=-g $(EXTRA_MGNUCFLAGS) $(EXTRA_CFLAGS)
 
 # override this with `mmake HAVE_NUPROLOG=yes'
 # if you want to rebuild the `.exp' files.
Index: tests/handle_options
===================================================================
RCS file: /home/staff/zs/imp/tests/handle_options,v
retrieving revision 1.3
diff -u -r1.3 handle_options
--- handle_options	1996/12/14 16:56:05	1.3
+++ handle_options	1997/03/17 07:21:29
@@ -24,12 +24,12 @@
 
 	-c|--cflags)
 		cflag="-c '$2'"
-		cflagsopt="EXTRA_CFLAGS=$2"
+		cflagsopt="EXTRA_CFLAGS='$2'"
 		shift ;;
 
 	-f|--flags)
 		fflag="-f '$2'"
-		flagsopt="EXTRA_MCFLAGS=$2"
+		flagsopt="EXTRA_MCFLAGS='$2'"
 		shift ;;
 
 	-g|--grade)
Index: tests/benchmarks/runtests
===================================================================
RCS file: /home/staff/zs/imp/tests/benchmarks/runtests,v
retrieving revision 1.2
diff -u -r1.2 runtests
--- runtests	1996/12/14 16:56:12	1.2
+++ runtests	1997/03/17 04:57:30
@@ -16,7 +16,7 @@
 
 mmake $jfactor clean > /dev/null 2>&1
 mmake $jfactor depend || exit 1
-mmake -k $jfactor $gradeopt "$flagsopt" "$cflagsopt" check
+eval mmake -k $jfactor $gradeopt $flagsopt $cflagsopt check
 checkstatus=$?
 
 cat *.res > .allres
Index: tests/general/runtests
===================================================================
RCS file: /home/staff/zs/imp/tests/general/runtests,v
retrieving revision 1.2
diff -u -r1.2 runtests
--- runtests	1996/12/14 16:56:15	1.2
+++ runtests	1997/03/17 05:26:13
@@ -16,7 +16,7 @@
 
 mmake $jfactor clean > /dev/null 2>&1
 mmake $jfactor depend || exit 1
-mmake -k $jfactor $gradeopt "$flagsopt" "$cflagsopt" check
+eval mmake -k $jfactor $gradeopt $flagsopt $cflagsopt check
 checkstatus=$?
 
 cat *.res > .allres
Index: tests/hard_coded/runtests
===================================================================
RCS file: /home/staff/zs/imp/tests/hard_coded/runtests,v
retrieving revision 1.2
diff -u -r1.2 runtests
--- runtests	1996/12/14 16:56:17	1.2
+++ runtests	1997/03/17 05:26:19
@@ -7,7 +7,7 @@
 
 mmake $jfactor clean > /dev/null 2>&1
 mmake $jfactor depend || exit 1
-mmake -k $jfactor $gradeopt "$flagsopt" "$cflagsopt" check
+eval mmake -k $jfactor $gradeopt $flagsopt $cflagsopt check
 checkstatus=$?
 
 cat *.res > .allres
Index: tests/misc_tests/runtests
===================================================================
RCS file: /home/staff/zs/imp/tests/misc_tests/runtests,v
retrieving revision 1.1
diff -u -r1.1 runtests
--- runtests	1997/01/29 01:17:07	1.1
+++ runtests	1997/03/17 05:26:42
@@ -7,7 +7,7 @@
 
 mmake $jfactor clean > /dev/null 2>&1
 mmake $jfactor depend || exit 1
-mmake -k $jfactor $gradeopt "$flagsopt" "$cflagsopt" check
+eval mmake -k $jfactor $gradeopt $flagsopt $cflagsopt check
 checkstatus=$?
 
 cat *.res > .allres
Index: tests/valid/runtests
===================================================================
RCS file: /home/staff/zs/imp/tests/valid/runtests,v
retrieving revision 1.2
diff -u -r1.2 runtests
--- runtests	1996/12/14 16:56:19	1.2
+++ runtests	1997/03/17 05:26:52
@@ -6,7 +6,7 @@
 
 mmake $jfactor realclean > /dev/null 2>&1
 mmake $jfactor depend || exit 1
-mmake -k $jfactor $gradeopt "$flagsopt" "$cflagsopt" check
+eval mmake -k $jfactor $gradeopt $flagsopt $cflagsopt check
 checkstatus=$?
 
 files=`mmake printtests`
Index: tests/warnings/runtests
===================================================================
RCS file: /home/staff/zs/imp/tests/warnings/runtests,v
retrieving revision 1.3
diff -u -r1.3 runtests
--- runtests	1996/12/14 16:56:22	1.3
+++ runtests	1997/03/17 05:27:04
@@ -6,7 +6,7 @@
 
 mmake $jfactor clean > /dev/null 2>&1
 mmake $jfactor depend || exit 1
-mmake -k $jfactor $gradeopt "$flagsopt" "$cflagsopt" check
+eval mmake -k $jfactor $gradeopt $flagsopt $cflagsopt check
 checkstatus=$?
 
 cat *.res > .allres

-- 
       Tyson Dowd           # "Well, let's just say, 'if your VCR is
                            #  still blinking 12:00, you don't
     trd at cs.mu.oz.au        #  want Linux'". 
http://www.cs.mu.oz.au/~trd #  --Bruce Perens, Debian's Fearless Leader