[m-rev.] diff: more recompilation test case fixes

[Simon Taylor]

Estimated hours taken: 1

tests/recompilation/test_functions:
	Pass `-k' to mmake when compiling the tests for which
	compilation could fail to avoid differing `.err' files
	when using parallel mmake.

	Avoid the use of `cp -f', which isn't totally portable.

tests/recompilation/add_type_re.err_exp.2:
tests/recompilation/remove_type_re.err_exp.2:
tests/recompilation/type_qual_re.err_exp.2:
	Update the expected output.

Index: add_type_re_2.err_exp.2
===================================================================
RCS file: /home/mercury1/repository/tests/recompilation/add_type_re_2.err_exp.2,v
retrieving revision 1.1
diff -u -u -r1.1 add_type_re_2.err_exp.2
--- add_type_re_2.err_exp.2	2001/06/27 05:04:52	1.1
+++ add_type_re_2.err_exp.2	2001/07/01 14:53:24
@@ -1,2 +1,2 @@
 Recompiling module `add_type_re_2':
-  file `add_type_re_2.used' not found.
+  file `add_type_re_2.m' has changed.
Index: remove_type_re_2.err_exp.2
===================================================================
RCS file: /home/mercury1/repository/tests/recompilation/remove_type_re_2.err_exp.2,v
retrieving revision 1.1
diff -u -u -r1.1 remove_type_re_2.err_exp.2
--- remove_type_re_2.err_exp.2	2001/06/27 05:05:16	1.1
+++ remove_type_re_2.err_exp.2	2001/07/01 14:53:30
@@ -1,2 +1,2 @@
 Recompiling module `remove_type_re_2':
-  file `remove_type_re_2.used' not found.
+  file `remove_type_re_2.m' has changed.
Index: test_functions
===================================================================
RCS file: /home/mercury1/repository/tests/recompilation/test_functions,v
retrieving revision 1.2
diff -u -u -r1.2 test_functions
--- test_functions	2001/06/29 08:01:29	1.2
+++ test_functions	2001/07/01 14:44:51
@@ -62,7 +62,8 @@
 	# respect to the `.m' file.
 	sleep 1
 
-	cp -f $module.m.$module_version $module.m
+	rm -f $module.m
+	cp $module.m.$module_version $module.m
 	chmod -w $module.m
 
 	# See comment in test_module().
@@ -130,8 +131,10 @@
 		# If the compilation is supposed to fail then the mmake
 		# output should be suppressed to avoid making it harder
 		# to find genuine failures in the nightly test logs.
+		# The `-k' option to mmake avoids differences in the output
+		# when using parallel mmakes.
 		#
-		eval mmake $mmakeopts $main_module > $failing_make_output 2>&1
+		eval mmake -k $mmakeopts $main_module > $failing_make_output 2>&1
 		;;
 	    false)
 		eval mmake $mmakeopts $main_module
Index: type_qual_re_2.err_exp.2
===================================================================
RCS file: /home/mercury1/repository/tests/recompilation/type_qual_re_2.err_exp.2,v
retrieving revision 1.1
diff -u -u -r1.1 type_qual_re_2.err_exp.2
--- type_qual_re_2.err_exp.2	2001/06/27 05:05:20	1.1
+++ type_qual_re_2.err_exp.2	2001/07/01 14:53:36
@@ -1,2 +1,2 @@
 Recompiling module `type_qual_re_2':
-  file `type_qual_re_2.used' not found.
+  file `type_qual_re_2.m' has changed.
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------