[m-rev.] diff: don't ignore tests for 0.10 branch

[Fergus Henderson]

Estimated hours taken: 0.5
Branches: main

tools/test_mercury:
	Fix a bug: for the 0.10 branch, invoke the test suite using the
	old method ("./runtests") rather than the new test suite framework
	("mmake runtests").  This is needed because the old branch doesn't
	have the new test suite framework.

Workspace: /home/ceres/fjh/mercury
Index: tools/test_mercury
===================================================================
RCS file: /home/mercury1/repository/mercury/tools/test_mercury,v
retrieving revision 1.188
diff -u -d -r1.188 test_mercury
--- tools/test_mercury	29 Aug 2002 05:02:23 -0000	1.188
+++ tools/test_mercury	29 Aug 2002 05:11:17 -0000
@@ -867,15 +867,24 @@
 for grade in $GRADES
 do
 	echo "test_mercury starting tests for grade $grade at `date`" 1>&2
-	mmake GRADE="$grade" \
-		EXTRA_MCFLAGS="$TEST_MCFLAGS" \
-		EXTRA_CFLAGS="$TEST_CFLAGS" \
-		EXTRA_MGNUCFLAGS="$TEST_MGNUCFLAGS" \
-		EXTRA_MLFLAGS="$TEST_MLFLAGS" \
-		$PARALLEL runtests || status=1
-	if [ -f runtests.errs ]; then
-		cat runtest.errs >> $test_error_file
-	fi
+	case $BRANCH in
+	    0.10)
+		./runtests -f "$TEST_MCFLAGS" -c "$TEST_CFLAGS" -g "$grade" \
+		       -m "$TEST_MGNUCFLAGS" -l "$TEST_MLFLAGS" \
+		       $PARALLEL || status=1
+		;;
+	    *)
+		mmake GRADE="$grade" \
+			EXTRA_MCFLAGS="$TEST_MCFLAGS" \
+			EXTRA_CFLAGS="$TEST_CFLAGS" \
+			EXTRA_MGNUCFLAGS="$TEST_MGNUCFLAGS" \
+			EXTRA_MLFLAGS="$TEST_MLFLAGS" \
+			$PARALLEL runtests || status=1
+		if [ -f runtests.errs ]; then
+			cat runtest.errs >> $test_error_file
+		fi
+		;;
+	esac
 	case $grade in
 		*.memprof*)
 			# we need to set LD_BIND_NOW=1
@@ -918,15 +927,24 @@
 	# XXX Note that some of these tests are currently expected to fail
 	# with `--target asm' (in particular the tests of tabling and
 	# nested modules), so we don't set status=1 if these tests fail.
-	mmake --target asm GRADE=hlc.gc \
-		EXTRA_MCFLAGS="$TEST_MCFLAGS" \
-		EXTRA_CFLAGS="$TEST_CFLAGS" \
-		EXTRA_MGNUCFLAGS="$TEST_MGNUCFLAGS" \
-		EXTRA_MLFLAGS="$TEST_MLFLAGS" \
-		$PARALLEL runtests
-	if [ -f runtests.errs ]; then
-		cat runtest.errs >> $test_error_file
-	fi
+	case $BRANCH in
+	    0.10)
+		./runtests --target asm -f "$TEST_MCFLAGS" -c "$TEST_CFLAGS" \
+			-g hlc.gc -m "$TEST_MGNUCFLAGS" -l "$TEST_MLFLAGS" \
+			$PARALLEL
+		;;
+	    *)
+		mmake --target asm GRADE=hlc.gc \
+			EXTRA_MCFLAGS="$TEST_MCFLAGS" \
+			EXTRA_CFLAGS="$TEST_CFLAGS" \
+			EXTRA_MGNUCFLAGS="$TEST_MGNUCFLAGS" \
+			EXTRA_MLFLAGS="$TEST_MLFLAGS" \
+			$PARALLEL runtests
+		if [ -f runtests.errs ]; then
+			cat runtest.errs >> $test_error_file
+		fi
+		;;
+	esac
 	;;
 esac
 echo "test_mercury finished tests at `date`" 1>&2

-- 
Fergus Henderson <fjh at cs.mu.oz.au>  |  "I have always known that the pursuit
The University of Melbourne         |  of excellence is a lethal habit"
WWW: <http://www.cs.mu.oz.au/~fjh>  |     -- the last words of T. S. Garp.
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------