[m-rev.] diff: test_mercury: ignore hlc.agc and hlc_nest failures

[Fergus Henderson]

Estimated hours taken: 0.5
Branches: main

tools/test_mercury:
	Commit various minor changes that we've already been using for some
	time now:
	- Ignore failures in grades hlc.agc and hlc_nest,
	  since these grades have some known bugs
	- Fix a bug in an error message: s/$grade/$GRADE/

Workspace: /home/mercury/public/test_mercury/scripts/mercury
Index: tools/test_mercury
===================================================================
RCS file: /home/mercury1/repository/mercury/tools/test_mercury,v
retrieving revision 1.219
diff -u -d -r1.219 test_mercury
--- tools/test_mercury	11 Nov 2002 05:18:47 -0000	1.219
+++ tools/test_mercury	11 Nov 2002 09:55:01 -0000
@@ -78,8 +78,18 @@
 GCC_ROTD_HOST=hg
 
 set_status () {
-	status=1;
-	echo '**' Error in $*
+	case "$*" in
+	    "tests in grade hlc.agc"* | "tests in grade hlc_nest"*)
+	        # These grades have known bugs which mean that they
+		# do not pass all of the tests.  So we do not fail
+		# if we get errors in those grades.
+	    	echo "** Error in $* (expected)"
+		;;
+	    *)
+		status=1;
+		echo "** Error in $*"
+		;;
+	esac
 }
 
 #-----------------------------------------------------------------------------#
@@ -741,7 +751,7 @@
 			mmake install LIBGRADES=$grade \
 					$PARALLEL MMAKEFLAGS=$PARALLEL &&
 			mmake realclean $PARALLEL MMAKEFLAGS=$PARALLEL) ||
-				set_status "clpr tests in grade $GRADE"
+				set_status "clpr tests in grade $grade"
 		echo "test trailed_update stuff for grade $grade" 1>&2
 		(cd mercury/extras/trailed_update &&
 			mmake realclean $PARALLEL MMAKEFLAGS=$PARALLEL &&
@@ -749,7 +759,7 @@
 			mmake -k	 $PARALLEL MMAKEFLAGS=$PARALLEL &&
 			mmake -k check	 $PARALLEL MMAKEFLAGS=$PARALLEL &&
 			mmake realclean $PARALLEL MMAKEFLAGS=$PARALLEL) ||
-			    set_status "trailed_update tests in grade $GRADE"
+			    set_status "trailed_update tests in grade $grade"
 		;;
 	    esac
 	done
@@ -849,6 +859,8 @@
 		       $PARALLEL || set_status "tests in grade $grade"
 		;;
 	    *)
+#	        echo "testing grade $grade, MCFLAGS=$TEST_MCFLAGS" \
+#			>> $TEST_ERROR_FILE
 		mmake GRADE="$grade" \
 			EXTRA_MCFLAGS="$TEST_MCFLAGS" \
 			EXTRA_CFLAGS="$TEST_CFLAGS" \

-- 
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
--------------------------------------------------------------------------