for review: small changes to bootcheck and test_mercury

[Zoltan Somogyi]

tools/bootcheck:
	If we can't make stage 1, try again after doing "mmake depend"
	in the library and the compiler directories. This cuts down
	on the number of times when

		you finish work on something
		you do a cvs update
		you fix the conflicts
		you set off an overnight bootcheck
		in the morning you find out that you should have done
			an mmake depend because the update added a new file

tools/test_mercury:
	Now that runtests does mmake realclean instead of mmake clean in
	the benchmark directory if the tests succeed, recreate the .dep
	files explicitly before doing the profiling test.

Zoltan.
cvs diff: Diffing .

Index: bootcheck
===================================================================
RCS file: /home/mercury1/repository/mercury/tools/bootcheck,v
retrieving revision 1.53
diff -u -u -r1.53 bootcheck
--- bootcheck	1998/05/12 06:05:49	1.53
+++ bootcheck	1998/05/16 00:50:46
@@ -339,8 +339,18 @@
 	then
 		echo "building of stage 1 successful"
 	else
-		echo "building of stage 1 not successful"
-		exit 1
+		cd $root/library;
+		mmake depend
+		cd $root/compiler;
+		mmake depend
+		cd $root
+		if mmake $mmake_opts MMAKEFLAGS=$jfactor all
+		then
+			echo "building of stage 1 successful"
+		else
+			echo "building of stage 1 not successful"
+			exit 1
+		fi
 	fi
 
 	# this is only for a transition period,
Index: test_mercury
===================================================================
RCS file: /home/mercury1/repository/mercury/tools/test_mercury,v
retrieving revision 1.66
diff -u -u -r1.66 test_mercury
--- test_mercury	1998/02/09 17:59:06	1.66
+++ test_mercury	1998/05/15 09:49:57
@@ -401,7 +401,8 @@
 		*.memprof*)
 			# we need to link statically for profiling on DEC Alpha
 			(cd benchmarks &&
-			rm -f poly &&
+			touch poly.m &&
+			mmake poly.depend &&
 			mmake poly \
 				GRADE="$grade" \
 				EXTRA_MCFLAGS="$TEST_MCFLAGS" \