[m-dev.] for review: install all needed grades before testing

[Mark Anthony BROWN]

Hi,

The nightly tests on hydra have been failing in the debugger/declarative
directory, with grade asm_fast.gc.prof.  The problem is that these tests
are linked with an older version of the browser library, since the new
library is not installed in that grade until after the tests are run.

This change will hopefully fix the problem.  Probably the best way to
test it is just to commit it and check the test logs tomorrow.  However,
I'd like Fergus to review it before I do that.

Cheers,
Mark.


Estimated hours taken: 1

Before running the nightly test cases, ensure that the libraries are
installed for all tested grades, not just the standard set of grades.

tools/test_mercury:
	Set GRADES to the list of installed library grades, and use this
	throughout the script.

Index: tools/test_mercury
===================================================================
RCS file: /home/mercury1/repository/mercury/tools/test_mercury,v
retrieving revision 1.116
diff -u -r1.116 test_mercury
--- tools/test_mercury	2000/08/16 08:14:58	1.116
+++ tools/test_mercury	2000/08/22 05:38:07
@@ -294,6 +294,54 @@
 # we can test in all grades _before_ installing, but presently this
 # is quite difficult.
 
+case $HOST in
+	mundook|murlibobo)
+		GRADES="none none.gc
+			reg reg.gc
+			asm_fast asm_fast.gc
+			asm_fast.prof asm_fast.gc.prof
+			asm_fast.gc.memprof
+			asm_fast.gc.tr asm_fast.tr asm_fast.gc.prof.tr
+			asm_fast.gc.tr.debug
+			"
+		;;
+# requires --enable-all-grades
+#	kryten)
+#		GRADES="none jump fast asm_jump asm_fast none.gc
+#			jump.gc fast.gc asm_jump.gc
+#			asm_fast.gc asm_fast.gc.prof asm_fast.prof asm_fast.gc.memprof
+#			asm_fast.gc.tr asm_fast.tr asm_fast.gc.prof.tr asm_fast.gc.tr.debug"
+#		;;
+	kryten|taifun|rimmer)
+		GRADES="asm_fast.gc asm_fast asm_fast.gc.prof asm_fast.prof
+			asm_fast.gc.memprof asm_fast.gc.tr
+			asm_fast.gc.tr.debug"
+		;;
+	munta)
+		GRADES="reg.gc asm_fast asm_fast.gc
+			reg.gc.prof asm_fast.gc.prof"
+		# Don't bother with these, otherwise it would take forever...
+		#	reg.prof asm_fast.prof reg.gc.memprof reg.gc.tr reg.gc.tr.debug
+		;;
+	hydra)
+		GRADES="asm_fast.gc asm_fast
+			asm_fast.gc.prof asm_fast.prof
+			asm_fast.gc.memprof asm_fast.gc.tr asm_fast.gc.tr.debug"
+		;;
+	hg)
+		GRADES="asm_fast.gc asm_fast
+			asm_fast.gc.prof asm_fast.prof
+			asm_fast.gc.memprof asm_fast.gc.tr asm_fast.gc.tr.debug
+			asm_fast.gc.par hlc.gc"
+		;;
+	quicksilver)
+		GRADES="asm_fast.gc asm_fast asm_fast.gc.tr.debug"
+		# Don't bother with these, otherwise it would take forever...
+		#	asm_fast.gc.prof asm_fast.prof
+		#	asm_fast.gc.memprof asm_fast.gc.tr"
+		;;
+esac
+
 : install the compiler
 
 echo "test_mercury starting installation at `date`" 1>&2
@@ -315,19 +363,10 @@
     # again, look back in the CVS archives for version 1.114 to see
     # the necessary code.
 
-    mmake install MMAKEFLAGS=$PARALLEL || status=1
+    mmake install LIBGRADES=$GRADES MMAKEFLAGS=$PARALLEL || status=1
     mmake install_split_library LIBGRADES= MMAKEFLAGS=$PARALLEL \
 	|| status=1
 
-	# If you want to add extra grades to install on specific hosts,
-	# do it here.
-    case $HOST in
-    	hg)	mmake install_grades LIBGRADES="asm_fast.par.gc" || status=1
-		;;
-	*)
-		;;
-    esac
-
     case $install_anyway in
         false)	cd ../.. || status=1 ;;
         true)	cd .. || status=1 ;;
@@ -344,16 +383,16 @@
 case $HOST in
 	murlibobo)
 		# requires --enable-all-grades
-		GRADES="asm_fast.gc.tr asm_fast.tr"
+		CLPR_GRADES="asm_fast.gc.tr asm_fast.tr"
 		;;
 	hg|quicksilver|hydra|kryten|taifun)
-		GRADES="asm_fast.gc.tr"
+		CLPR_GRADES="asm_fast.gc.tr"
 		;;
 	*)
-		GRADES=""
+		CLPR_GRADES=""
 		;;
 esac
-for grade in $GRADES kludge_for_broken_shells
+for grade in $CLPR_GRADES kludge_for_broken_shells
 do
 	if [ "$grade" != kludge_for_broken_shells ]; then
 		echo "test clpr stuff for grade $grade" 1>&2
@@ -430,53 +469,6 @@
 
 #MERCURY_COMPILER=$DIR/mercury/stage2/compiler/mercury_compile
 #export MERCURY_COMPILER
-case $HOST in
-	mundook|murlibobo)
-		GRADES="none none.gc
-			reg reg.gc
-			asm_fast asm_fast.gc
-			asm_fast.prof asm_fast.gc.prof
-			asm_fast.gc.memprof
-			asm_fast.gc.tr asm_fast.tr asm_fast.gc.prof.tr
-			asm_fast.gc.tr.debug
-			"
-		;;
-# requires --enable-all-grades
-#	kryten)
-#		GRADES="none jump fast asm_jump asm_fast none.gc
-#			jump.gc fast.gc asm_jump.gc
-#			asm_fast.gc asm_fast.gc.prof asm_fast.prof asm_fast.gc.memprof
-#			asm_fast.gc.tr asm_fast.tr asm_fast.gc.prof.tr asm_fast.gc.tr.debug"
-#		;;
-	kryten|taifun|rimmer)
-		GRADES="asm_fast.gc asm_fast asm_fast.gc.prof asm_fast.prof
-			asm_fast.gc.memprof asm_fast.gc.tr
-			asm_fast.gc.tr.debug"
-		;;
-	munta)
-		GRADES="reg.gc asm_fast asm_fast.gc
-			reg.gc.prof asm_fast.gc.prof"
-		# Don't bother with these, otherwise it would take forever...
-		#	reg.prof asm_fast.prof reg.gc.memprof reg.gc.tr reg.gc.tr.debug
-		;;
-	hydra)
-		GRADES="asm_fast.gc asm_fast
-			asm_fast.gc.prof asm_fast.prof
-			asm_fast.gc.memprof asm_fast.gc.tr asm_fast.gc.tr.debug"
-		;;
-	hg)
-		GRADES="asm_fast.gc asm_fast
-			asm_fast.gc.prof asm_fast.prof
-			asm_fast.gc.memprof asm_fast.gc.tr asm_fast.gc.tr.debug
-			asm_fast.gc.par hlc.gc"
-		;;
-	quicksilver)
-		GRADES="asm_fast.gc asm_fast asm_fast.gc.tr.debug"
-		# Don't bother with these, otherwise it would take forever...
-		#	asm_fast.gc.prof asm_fast.prof
-		#	asm_fast.gc.memprof asm_fast.gc.tr"
-		;;
-esac
 
 cd tests || { false; exit 1; }
 
--------------------------------------------------------------------------
mercury-developers mailing list
Post messages to:       mercury-developers at cs.mu.oz.au
Administrative Queries: owner-mercury-developers at cs.mu.oz.au
Subscriptions:          mercury-developers-request at cs.mu.oz.au
--------------------------------------------------------------------------