[m-dev.] diff: bootcheck --test-params

[Zoltan Somogyi]

tools/bootcheck:
	If the new --test-params option is given, copy the stage 2 Mmake.params
	file to the tests directory. This capability is required to test
	changes like this: compiling the library without special preds and
	the test cases with special preds causes lots of spurious errors
	in which a test case assumes that since it was compiled with special
	preds, all other modules it is linked with are also compiled with
	special preds, and thus makes calls to non-existent special preds
	for the types defined in the library.

tests/*/Mmakefile:
tests/*/*/Mmakefile:
	Include Mmake.params from the top level tests directory if it exists.

Zoltan.

cvs diff: Diffing tools
Index: tools/bootcheck
===================================================================
RCS file: /home/mercury1/repository/mercury/tools/bootcheck,v
retrieving revision 1.93
diff -u -b -r1.93 bootcheck
--- tools/bootcheck	2000/03/31 01:39:58	1.93
+++ tools/bootcheck	2000/03/31 06:16:10
@@ -60,6 +60,9 @@
 	-3, --keep-stage-3
 		Don't rebuild the stage 3 directory from scratch after
 		building stage 1.  Instead use the existing stage 3 directory.
+	--test-params
+		When executing the test suite, use the stage 2 Mmake.params
+		file.
 	--stop-after-stage-2
 		Stop after building stage 2, even if it is successful.
 	--use-subdirs
@@ -76,6 +79,7 @@
 do_bootcheck=true
 grade=
 test_grade=
+test_params=false
 copy_runtime=false
 copy_boehm_gc=false
 copy_profiler=false
@@ -155,6 +159,9 @@
 	-3|--keep-stage-3)
 		keep_stage_3=true ;;
 
+	--test-params)
+		test_params=true ;;
+
 	--stop-after-stage-2)
 		stop_after_stage_2=true ;;
 
@@ -743,6 +750,14 @@
 
 	if test "$test_status" = 0
 	then
+		if $test_params
+		then
+			cp $root/stage2/Mmake.params ${tests_prefix}tests
+		else
+			/bin/rm ${tests_prefix}tests/Mmake.params \
+				> /dev/null 2>&1
+		fi
+
 		cp $root/doc/mdb_command_test.inp ${tests_prefix}tests/debugger
 		if test "$testdirs" = ""
 		then
cvs diff: Diffing tests
cvs diff: Diffing tests/benchmarks
Index: tests/benchmarks/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/tests/benchmarks/Mmakefile,v
retrieving revision 1.1
diff -u -b -r1.1 Mmakefile
--- tests/benchmarks/Mmakefile	1997/09/29 18:04:00	1.1
+++ tests/benchmarks/Mmakefile	2000/03/28 15:54:39
@@ -3,6 +3,7 @@
 main_target: check
 
 include ../Mmake.common
+-include ../Mmake.params
 
 #-----------------------------------------------------------------------------#
 
cvs diff: Diffing tests/debugger
Index: tests/debugger/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/Mmakefile,v
retrieving revision 1.35
diff -u -b -r1.35 Mmakefile
--- tests/debugger/Mmakefile	2000/01/23 01:13:45	1.35
+++ tests/debugger/Mmakefile	2000/03/28 15:54:53
@@ -3,6 +3,7 @@
 main_target:	check
 
 include ../Mmake.common
+-include ../Mmake.params
 
 RM_C=:
 
cvs diff: Diffing tests/debugger/declarative
Index: tests/debugger/declarative/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/Mmakefile,v
retrieving revision 1.12
diff -u -b -r1.12 Mmakefile
--- tests/debugger/declarative/Mmakefile	2000/02/22 10:46:05	1.12
+++ tests/debugger/declarative/Mmakefile	2000/03/28 15:55:58
@@ -3,6 +3,7 @@
 main_target:	check
 
 include ../../Mmake.common
+-include ../../Mmake.params
 
 RM_C=:
 
cvs diff: Diffing tests/dppd
cvs diff: Diffing tests/general
Index: tests/general/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/tests/general/Mmakefile,v
retrieving revision 1.28
diff -u -b -r1.28 Mmakefile
--- tests/general/Mmakefile	2000/02/03 12:09:06	1.28
+++ tests/general/Mmakefile	2000/03/28 15:55:07
@@ -3,6 +3,7 @@
 main_target: check
 
 include ../Mmake.common
+-include ../Mmake.params
 
 #-----------------------------------------------------------------------------#
 
cvs diff: Diffing tests/general/accumulator
Index: tests/general/accumulator/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/tests/general/accumulator/Mmakefile,v
retrieving revision 1.9
diff -u -b -r1.9 Mmakefile
--- tests/general/accumulator/Mmakefile	2000/02/21 01:31:35	1.9
+++ tests/general/accumulator/Mmakefile	2000/03/28 15:56:03
@@ -3,6 +3,7 @@
 main_target: check
 
 include ../../Mmake.common
+-include ../../Mmake.params
 
 #-----------------------------------------------------------------------------#
 
cvs diff: Diffing tests/hard_coded
Index: tests/hard_coded/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/tests/hard_coded/Mmakefile,v
retrieving revision 1.81
diff -u -b -r1.81 Mmakefile
--- tests/hard_coded/Mmakefile	2000/03/28 12:11:37	1.81
+++ tests/hard_coded/Mmakefile	2000/03/29 04:49:28
@@ -3,6 +3,7 @@
 main_target: check
 
 include ../Mmake.common
+-include ../Mmake.params
 
 #-----------------------------------------------------------------------------#
 
cvs diff: Diffing tests/hard_coded/exceptions
Index: tests/hard_coded/exceptions/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/tests/hard_coded/exceptions/Mmakefile,v
retrieving revision 1.2
diff -u -b -r1.2 Mmakefile
--- tests/hard_coded/exceptions/Mmakefile	2000/01/26 05:37:12	1.2
+++ tests/hard_coded/exceptions/Mmakefile	2000/03/28 15:56:06
@@ -10,6 +10,7 @@
 MAIN_TARGET = check
 
 include ../../Mmake.common
+-include ../../Mmake.params
 
 PROGS = test_exceptions.m test_uncaught_exception.m test_exceptions_func.m
 #
cvs diff: Diffing tests/hard_coded/sub-modules
Index: tests/hard_coded/sub-modules/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/tests/hard_coded/sub-modules/Mmakefile,v
retrieving revision 1.1
diff -u -b -r1.1 Mmakefile
--- tests/hard_coded/sub-modules/Mmakefile	1998/11/09 03:52:53	1.1
+++ tests/hard_coded/sub-modules/Mmakefile	2000/03/28 15:56:09
@@ -8,6 +8,7 @@
 main_target: check
 
 include ../../Mmake.common
+-include ../../Mmake.params
 
 #-----------------------------------------------------------------------------#
 
cvs diff: Diffing tests/hard_coded/typeclasses
Index: tests/hard_coded/typeclasses/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/tests/hard_coded/typeclasses/Mmakefile,v
retrieving revision 1.26
diff -u -b -r1.26 Mmakefile
--- tests/hard_coded/typeclasses/Mmakefile	2000/03/27 05:08:05	1.26
+++ tests/hard_coded/typeclasses/Mmakefile	2000/03/28 15:56:13
@@ -3,6 +3,7 @@
 main_target: check
 
 include ../../Mmake.common
+-include ../../Mmake.params
 
 #-----------------------------------------------------------------------------#
 
cvs diff: Diffing tests/invalid
Index: tests/invalid/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/tests/invalid/Mmakefile,v
retrieving revision 1.60
diff -u -b -r1.60 Mmakefile
--- tests/invalid/Mmakefile	2000/03/27 05:08:23	1.60
+++ tests/invalid/Mmakefile	2000/03/28 15:55:14
@@ -3,6 +3,7 @@
 main_target: check
 
 include ../Mmake.common
+-include ../Mmake.params
 
 #-----------------------------------------------------------------------------#
 
cvs diff: Diffing tests/misc_tests
Index: tests/misc_tests/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/tests/misc_tests/Mmakefile,v
retrieving revision 1.12
diff -u -b -r1.12 Mmakefile
--- tests/misc_tests/Mmakefile	1999/07/14 17:03:52	1.12
+++ tests/misc_tests/Mmakefile	2000/03/28 15:55:16
@@ -3,6 +3,7 @@
 main_target: check
 
 include ../Mmake.common
+-include ../Mmake.params
 
 MCFLAGS-pretty_print_test = --no-line-numbers
 
cvs diff: Diffing tests/tabling
Index: tests/tabling/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/tests/tabling/Mmakefile,v
retrieving revision 1.10
diff -u -b -r1.10 Mmakefile
--- tests/tabling/Mmakefile	2000/01/03 08:53:10	1.10
+++ tests/tabling/Mmakefile	2000/03/28 15:55:20
@@ -3,6 +3,7 @@
 main_target: check
 
 include ../Mmake.common
+-include ../Mmake.params
 
 #-----------------------------------------------------------------------------#
 
cvs diff: Diffing tests/term
Index: tests/term/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/tests/term/Mmakefile,v
retrieving revision 1.15
diff -u -b -r1.15 Mmakefile
--- tests/term/Mmakefile	2000/02/10 01:12:30	1.15
+++ tests/term/Mmakefile	2000/03/28 15:55:23
@@ -3,6 +3,7 @@
 main_target: check
 
 include ../Mmake.common
+-include ../Mmake.params
 
 #-----------------------------------------------------------------------------#
 
cvs diff: Diffing tests/valid
Index: tests/valid/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/tests/valid/Mmakefile,v
retrieving revision 1.58
diff -u -b -r1.58 Mmakefile
--- tests/valid/Mmakefile	2000/03/17 14:24:58	1.58
+++ tests/valid/Mmakefile	2000/03/28 15:55:26
@@ -3,6 +3,7 @@
 main_target: all
 
 include ../Mmake.common
+-include ../Mmake.params
 
 #-----------------------------------------------------------------------------#
 
cvs diff: Diffing tests/warnings
Index: tests/warnings/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/tests/warnings/Mmakefile,v
retrieving revision 1.11
diff -u -b -r1.11 Mmakefile
--- tests/warnings/Mmakefile	2000/03/25 17:04:11	1.11
+++ tests/warnings/Mmakefile	2000/03/28 15:55:39
@@ -1,5 +1,7 @@
 #-----------------------------------------------------------------------------#
 
+-include ../Mmake.params
+
 main_target: check
 
 #-----------------------------------------------------------------------------#
--------------------------------------------------------------------------
mercury-developers mailing list
Post messages to:       mercury-developers at cs.mu.oz.au
Administrative Queries: owner-mercury-developers at cs.mu.oz.au
Subscriptions:          mercury-developers-request at cs.mu.oz.au
--------------------------------------------------------------------------