[m-rev.] diff: $HOME

[Zoltan Somogyi]

On 20-Aug-2002, Simon Taylor <stayl at cs.mu.OZ.AU> wrote:
> tests/debugger/Mmakefile and tests/debugger/declarative/Mmakefile
> define a variable MDB which would be a better place to override
> the value of $HOME. The definition of the MDB variable should also
> be moved to tests/Mmake.common.

Move the override of $HOME to tests/Mmake.common, to reduce its effect to the
minimum.

tools/bootcheck:
	Do not override $HOME.

tests/Mmake.common:
	Move the definition of MDB here from the Mmakefiles in the debugger
	test directories, and add an override of $HOME.

tests/debugger/Mmakefile:
tests/debugger/declarative/Mmakefile:
	Remove the definition of MDB from these files.

Zoltan.

cvs diff: Diffing tools
Index: tools/bootcheck
===================================================================
RCS file: /home/mercury1/repository/mercury/tools/bootcheck,v
retrieving revision 1.136
diff -u -b -r1.136 bootcheck
--- tools/bootcheck	2002/08/21 11:27:56	1.136
+++ tools/bootcheck	2002/08/22 10:06:06
@@ -974,12 +974,6 @@
 	MERCURY_DEBUGGER_INIT=$root/scripts/test_mdbrc
 	export MERCURY_DEBUGGER_INIT
 
-	# Avoid picking up parameter settings from $HOME/.mdbrc that could
-	# cause spurious differences between the outputs of the debugger test
-	# cases and their expected outputs.
-	HOME=/nonexistent
-	export HOME
-
 	if test "$test_grade" != ""
 	then
 		test_grade_opt="GRADE=$test_grade"
cvs diff: Diffing tests
Index: tests/Mmake.common
===================================================================
RCS file: /home/mercury1/repository/tests/Mmake.common,v
retrieving revision 1.26
diff -u -b -r1.26 Mmake.common
--- tests/Mmake.common	2002/08/19 04:40:04	1.26
+++ tests/Mmake.common	2002/08/27 03:42:48
@@ -49,6 +49,16 @@
 # deep profiling.
 RUN_RECOMPILATION_TESTS=yes
 
+# We avoid picking up parameter settings from $HOME/.mdbrc that could
+# cause spurious differences between the outputs of the debugger test
+# cases and their expected outputs.
+
+# 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 = HOME=/nonexistent MERCURY_SUPPRESS_MDB_BANNER=yes mdb
+
 #-----------------------------------------------------------------------------#
 
 # .PRECIOUS: %.c %.o %_init.c
cvs diff: Diffing tests/benchmarks
cvs diff: Diffing tests/debugger
Index: tests/debugger/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/Mmakefile,v
retrieving revision 1.81
diff -u -b -r1.81 Mmakefile
--- tests/debugger/Mmakefile	2002/08/17 13:52:01	1.81
+++ tests/debugger/Mmakefile	2002/08/27 03:46:29
@@ -4,14 +4,6 @@
 
 #-----------------------------------------------------------------------------#
 
-# 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
-
-#-----------------------------------------------------------------------------#
-
 RETRY_PROGS = \
 	all_solutions			\
 	browser_test			\
cvs diff: Diffing tests/debugger/declarative
Index: tests/debugger/declarative/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/Mmakefile,v
retrieving revision 1.38
diff -u -b -r1.38 Mmakefile
--- tests/debugger/declarative/Mmakefile	2002/08/17 13:52:03	1.38
+++ tests/debugger/declarative/Mmakefile	2002/08/27 03:46:33
@@ -4,14 +4,6 @@
 
 #-----------------------------------------------------------------------------#
 
-# 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
-
-#-----------------------------------------------------------------------------#
-
 DECLARATIVE_PROGS=		\
 	aadebug			\
 	app			\
cvs diff: Diffing tests/dppd
cvs diff: Diffing tests/general
cvs diff: Diffing tests/general/accumulator
cvs diff: Diffing tests/general/structure_reuse
cvs diff: Diffing tests/hard_coded
cvs diff: Diffing tests/hard_coded/exceptions
cvs diff: Diffing tests/hard_coded/purity
cvs diff: Diffing tests/hard_coded/sub-modules
cvs diff: Diffing tests/hard_coded/typeclasses
cvs diff: Diffing tests/invalid
cvs diff: Diffing tests/invalid/purity
cvs diff: Diffing tests/misc_tests
cvs diff: Diffing tests/recompilation
cvs diff: Diffing tests/tabling
cvs diff: Diffing tests/term
cvs diff: Diffing tests/valid
cvs diff: Diffing tests/warnings
--------------------------------------------------------------------------
mercury-reviews mailing list
post:  mercury-reviews at cs.mu.oz.au
administrative address: owner-mercury-reviews at cs.mu.oz.au
unsubscribe: Address: mercury-reviews-request at cs.mu.oz.au Message: unsubscribe
subscribe:   Address: mercury-reviews-request at cs.mu.oz.au Message: subscribe
--------------------------------------------------------------------------