[m-dev.] diff: test hl* grades on roy

[Fergus Henderson]

Estimated hours taken: 0.5

tools/test_mercury:
tools/run_all_tests_from_cron:
	Set things up to test the hl* grades on roy.

Workspace: /home/pgrad/fjh/ws/hg
Index: tools/run_all_tests_from_cron
===================================================================
RCS file: /home/mercury1/repository/mercury/tools/run_all_tests_from_cron,v
retrieving revision 1.22
diff -u -d -r1.22 run_all_tests_from_cron
--- tools/run_all_tests_from_cron	2000/10/22 17:09:53	1.22
+++ tools/run_all_tests_from_cron	2000/12/14 05:51:28
@@ -35,12 +35,13 @@
 	hg) 		ARCH=i686	FULLARCH=i686-pc-linux-gnu ;;
 	hydra)		ARCH=i686	FULLARCH=i686-pc-linux-gnu ;;
 	ender)		ARCH=i686	FULLARCH=i686-pc-linux-gnu ;;
+	roy)		ARCH=i686	FULLARCH=i686-pc-linux-gnu ;;
 	*)		echo "$0: unknown HOST $HOST" 1>&2; exit 1 ;;
 esac
 
 case $HOST in
 	kryten|taifun) 	mail="rsh mundook /bin/mail" ;;
-	hydra|ender)	mail=/usr/bin/mail ;;
+	hydra|ender|roy) mail=/usr/bin/mail ;;
 	*)		mail=/bin/mail ;;
 esac
 
Index: tools/test_mercury
===================================================================
RCS file: /home/mercury1/repository/mercury/tools/test_mercury,v
retrieving revision 1.125
diff -u -d -r1.125 test_mercury
--- tools/test_mercury	2000/11/06 03:26:35	1.125
+++ tools/test_mercury	2000/12/14 06:17:19
@@ -61,6 +61,7 @@
 	taifun) 	OPTIMIZE=-O1 ;;
 	quicksilver) 	OPTIMIZE=-O0 ;;
 	hg) 		OPTIMIZE=-O4 ;;
+	roy) 		OPTIMIZE=-O4 ;;
 	hydra)		OPTIMIZE=-O2 ;;
 	ender)		OPTIMIZE=-O3 ;;
 	kryten) 	OPTIMIZE=-O1 ;;	# currently not used
@@ -107,7 +108,7 @@
 DIR=$TESTDIR/test_dirs/$HOST
 
 case $HOST in
-	hg|ender)	
+	hg|ender|roy)	
 		INSTALL_DIR=/home/$HOST/public/mercury-latest/$FULLARCH ;;
 	*)		
 		INSTALL_DIR=/home/mercury/public/mercury-latest/$FULLARCH ;;
@@ -143,12 +144,14 @@
 	hydra)		PARALLEL=-j2 ;; # out of two CPUs
 	quicksilver) 	PARALLEL= ;; 	# one CPU
 	hg) 		PARALLEL= ;; 	# one CPU
+	ender) 		PARALLEL= ;; 	# one CPU
+	roy) 		PARALLEL= ;; 	# one CPU
 	*)		PARALLEL= ;;
 esac
 
 # version of the mercury compiler to use for bootstrapping
 case $HOST in
-	hg|ender)
+	hg|ender|roy)
 		BOOTSTRAP_MERCURY_COMPILER=/home/$HOST/public/mercury-latest/$FULLARCH/lib/mercury/bin/$FULLARCH/mercury_compile
 		;;
 	*)
@@ -218,6 +221,13 @@
 		# to work
 		CONFIG_OPTS="--enable-all-hlc-grades \
 			--enable-new-mercuryfile-struct" ;;
+	roy)
+		CONFIG_OPTS=""
+		INSTALL_GRADE="hlc.gc"
+		INSTALL_LIBGRADES="hl.gc \
+			hlc.gc.prof hlc.gc.memprof hlc.gc.tr hlc.par.gc \
+			hl.gc.prof  hl.gc.memprof  hl.gc.tr  hl.par.gc"
+		;;
 	*)	
 		CONFIG_OPTS="" ;;
 esac
@@ -241,7 +251,7 @@
 cd $DIR || { false; exit 1; }
 cvs checkout $CHECKOUT_OPTS mercury tests || { false; exit 1; }
 case $HOST in
-	murlibobo|kryten|taifun|quicksilver|hg|hydra)
+	murlibobo|kryten|taifun|quicksilver|hg|hydra|roy)
 		[ -d mercury/extras/clpr/CVS ] ||
 		(cd mercury/extras && cvs checkout $CHECKOUT_OPTS clpr) ||
 			{ false; exit 1; }
@@ -269,6 +279,16 @@
 	echo "EXTRA_MGNUCFLAGS = $INSTALL_MGNUCFLAGS" >> Mmake.params
 	echo "EXTRA_CFLAGS = $INSTALL_CFLAGS" >> Mmake.params
 	echo "EXTRA_MLFLAGS = $INSTALL_MLFLAGS" >> Mmake.params
+	case "$INSTALL_GRADE" in
+		"")	;;
+		*)	echo "GRADE = $INSTALL_GRADE" >> Mmake.params
+			;;
+	esac
+	case "$INSTALL_LIBGRADES" in
+		"")	;;
+		*)	echo "LIBGRADES = $INSTALL_LIBGRADES" >> Mmake.params
+			;;
+	esac
 # fi
 
 autoconf || { false; exit 1; }
@@ -315,8 +335,14 @@
     # the necessary code.
 
     mmake install MMAKEFLAGS=$PARALLEL || status=1
-    mmake install_split_library LIBGRADES= MMAKEFLAGS=$PARALLEL \
-	|| status=1
+    case "$INSTALL_GRADE" in
+	hl*)
+	    	# --split-c-files is not supported for the hl* grades
+	    	;;
+	*)	mmake install_split_library LIBGRADES= MMAKEFLAGS=$PARALLEL ||
+	    		status=1
+		;;
+    esac
 
 	# If you want to add extra grades to install on specific hosts,
 	# do it here.  Any grade which is tested later, but which is not
@@ -349,6 +375,9 @@
 	hg|quicksilver|hydra|ender|kryten|taifun)
 		GRADES="asm_fast.gc.tr"
 		;;
+	roy)
+		GRADES="hlc.gc.tr hl.gc.tr"
+		;;
 	*)
 		GRADES=""
 		;;
@@ -467,6 +496,10 @@
 			asm_fast.gc.memprof asm_fast.gc.tr asm_fast.gc.tr.debug
 			asm_fast.par.gc hlc.gc"
 		;;
+	roy)
+		GRADES="hlc.gc hlc.gc.prof hlc.gc.memprof hlc.gc.tr hlc.par.gc
+			hl.gc  hl.gc.prof  hl.gc.memprof  hl.gc.tr  hl.par.gc"
+		;;
 	ender)
 		GRADES="asm_fast.gc asm_fast
 			asm_fast.gc.prof asm_fast.prof
@@ -547,6 +580,9 @@
 case $HOST in
 	hg)	
 		fullname=i686-pc-linux-libc2.1-gnu-O4
+		;;
+	roy)	
+		fullname=i686-pc-linux-libc2.1-gnu-O4-hlc
 		;;
 	quicksilver)	
 		fullname=i586-pc-linux-libc2.1-gnu-O0
-- 
Fergus Henderson <fjh at cs.mu.oz.au>  |  "I have always known that the pursuit
                                    |  of excellence is a lethal habit"
WWW: <http://www.cs.mu.oz.au/~fjh>  |     -- the last words of T. S. Garp.
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------