diff: tests/debugger: move mdb banner suppression to Mmakefile

Fergus Henderson fjh at cs.mu.OZ.AU
Thu Dec 17 04:27:58 AEDT 1998


tests/debugger/Mmakefile:
tests/debugger/runtests:
	Set MERCURY_SUPPRESS_MDB_BANNER in the Mmakefile rather than
	in the runtests script, so that `mmake check' works.

Index: tests/debugger/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/Mmakefile,v
retrieving revision 1.13
diff -u -r1.13 Mmakefile
--- Mmakefile	1998/10/30 04:46:36	1.13
+++ Mmakefile	1998/11/08 23:06:01
@@ -8,6 +8,14 @@
 
 #-----------------------------------------------------------------------------#
 
+# We suppress the printing of the banner, because different workspaces
+# may get different version numbers printed in it. This would otherwise be
+# the source of irrelevant difference between the actual and expected outputs.
+
+MDB = MERCURY_SUPPRESS_MDB_BANNER=yes mdb
+
+#-----------------------------------------------------------------------------#
+
 DEBUGGER_PROGS=	\
 	debugger_regs			\
 	existential_type_classes	\
@@ -42,28 +50,28 @@
 #-----------------------------------------------------------------------------#
 
 debugger_regs.out: debugger_regs debugger_regs.inp
-	mdb ./debugger_regs < debugger_regs.inp > debugger_regs.out
+	$(MDB) ./debugger_regs < debugger_regs.inp > debugger_regs.out
 
 existential_type_classes.out: existential_type_classes \
 			existential_type_classes.inp
-	mdb ./existential_type_classes < existential_type_classes.inp > existential_type_classes.out
+	$(MDB) ./existential_type_classes < existential_type_classes.inp > existential_type_classes.out
 
 implied_instance.out: implied_instance implied_instance.inp
-	mdb ./implied_instance < implied_instance.inp > implied_instance.out
+	$(MDB) ./implied_instance < implied_instance.inp > implied_instance.out
 
 interpreter.out: interpreter interpreter.inp
-	mdb ./interpreter interpreter.m < interpreter.inp > interpreter.out
+	$(MDB) ./interpreter interpreter.m < interpreter.inp > interpreter.out
 
 multi_parameter.out: multi_parameter multi_parameter.inp
-	mdb ./multi_parameter < multi_parameter.inp > multi_parameter.out
+	$(MDB) ./multi_parameter < multi_parameter.inp > multi_parameter.out
 
 queens.out: queens queens.inp
-	mdb ./queens < queens.inp > queens.out
+	$(MDB) ./queens < queens.inp > queens.out
 
 # We ignore the result of this action because
 # the exit status of grep is not useful in this case
 mdb_command_test.out: queens mdb_command_test.inp
-	-mdb ./queens < mdb_command_test.inp \
+	-$(MDB) ./queens < mdb_command_test.inp \
 		| egrep "internal error in the trace help system" \
 		> mdb_command_test.out
 
Index: tests/debugger/runtests
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/runtests,v
retrieving revision 1.5
diff -u -r1.5 runtests
--- runtests	1998/10/16 06:19:52	1.5
+++ runtests	1998/11/08 23:03:46
@@ -6,12 +6,6 @@
 . ../handle_options
 . ../startup
 
-# We suppress the printing of the banner, because different workspaces
-# may get different version numbers printed in it. This would otherwise be
-# the source of irrelevant difference between the actual and expected outputs.
-MERCURY_SUPPRESS_MDB_BANNER=yes
-export MERCURY_SUPPRESS_MDB_BANNER
-
 mmake $jfactor depend || exit 1
 eval mmake -k $jfactor $gradeopt $flagsopt $cflagsopt check
 checkstatus=$?

-- 
Fergus Henderson <fjh at cs.mu.oz.au>  |  "Binaries may die
WWW: <http://www.cs.mu.oz.au/~fjh>  |   but source code lives forever"
PGP: finger fjh at 128.250.37.3        |     -- leaked Microsoft memo.



More information about the developers mailing list