[m-rev.] diff: set up tests on ceres

Simon Taylor stayl at cs.mu.OZ.AU
Wed Nov 7 17:24:13 AEDT 2001


Estimated hours taken: 0.25

tools/run_all_tests_from_cron:
tools/test_mercury:
	Set up tests on ceres (hlc, -O5, --use-subdirs).

Index: run_all_tests_from_cron
===================================================================
RCS file: /home/mercury1/repository/mercury/tools/run_all_tests_from_cron,v
retrieving revision 1.42
diff -u -u -r1.42 run_all_tests_from_cron
--- run_all_tests_from_cron	16 Sep 2001 14:34:22 -0000	1.42
+++ run_all_tests_from_cron	7 Nov 2001 06:12:29 -0000
@@ -46,6 +46,7 @@
 	venus)		ARCH=i686	FULLARCH=i686-pc-linux-gnu ;;
 	earth)		ARCH=i686	FULLARCH=i686-pc-linux-gnu ;;
 	mars)		ARCH=i686	FULLARCH=i686-pc-linux-gnu ;;
+	ceres)		ARCH=i686	FULLARCH=i686-pc-linux-gnu ;;
 	*)		echo "$0: unknown HOST $HOST" 1>&2; exit 1 ;;
 esac
 
Index: test_mercury
===================================================================
RCS file: /home/mercury1/repository/mercury/tools/test_mercury,v
retrieving revision 1.166
diff -u -u -r1.166 test_mercury
--- test_mercury	31 Oct 2001 07:02:29 -0000	1.166
+++ test_mercury	7 Nov 2001 06:18:34 -0000
@@ -142,6 +142,7 @@
 			;;
 
 	mars)		OPTIMIZE=-O5 ;;
+	ceres)		OPTIMIZE=-O5 ;;	# hlc
 	kryten) 	OPTIMIZE=-O1 ;;	# currently not used
 	rimmer) 	OPTIMIZE=-O1 ;; # currently not used
 esac
@@ -193,7 +194,7 @@
 DIR=$HOSTDIR/build.$BRANCH.$C_COMPILER
 
 case $HOST in
-	hg|ender|roy|venus|earth|mars) 	
+	hg|ender|roy|venus|earth|mars|ceres) 	
 		INSTALL_DIR=/home/$HOST/public/$INSTALL_DIR_NAME/$FULLARCH ;;
 	*)		
 		INSTALL_DIR=/home/mercury/public/$INSTALL_DIR_NAME/$FULLARCH ;;
@@ -246,13 +247,14 @@
 	venus) 		PARALLEL= ;; 	# one CPU
 	earth) 		PARALLEL= ;; 	# one CPU
 	mars) 		PARALLEL= ;; 	# one CPU
+	ceres) 		PARALLEL= ;; 	# one CPU
 	*)		PARALLEL= ;;
 esac
 
 # version of the mercury compiler to use for bootstrapping
 case $HOST in
-	hg|ender|roy|venus|earth)
-		# XXX Add mars to the list above once a compiler
+	hg|ender|roy|venus|earth|mars)
+		# XXX Add ceres to the list above once a compiler
 		# is installed there.
 		BOOTSTRAP_MERCURY_COMPILER=/home/$HOST/public/$INSTALL_DIR_NAME/$FULLARCH/lib/mercury/bin/$FULLARCH/mercury_compile
 		;;
@@ -323,7 +325,7 @@
 		# to work
 		CONFIG_OPTS="--enable-hlc-prof-grades \
 			--enable-new-mercuryfile-struct" ;;
-	roy)
+	roy|ceres)
 		CONFIG_OPTS=""
 		DEFAULT_GRADE="hlc.gc"
 		export DEFAULT_GRADE
@@ -364,7 +366,7 @@
 			;;
 		esac
 		;;
-	mars)
+	mars|ceres)
 		# Portable .NET is installed on mars, and the
 		# test in configure.in doesn't test whether the
 		# ilasm it finds is suitable for use with Mercury.
@@ -462,7 +464,7 @@
 		;;
 esac
 case $HOST in
-	murlibobo|kryten|taifun|quicksilver|hg|hydra|roy|venus|ender|earth|mars)
+	murlibobo|kryten|taifun|quicksilver|hg|hydra|roy|venus|ender|earth|mars|ceres)
 		[ -d mercury/extras/clpr/CVS ] ||
 		(cd mercury/extras && cvs checkout $CHECKOUT_OPTS clpr) ||
 			{ false; exit 1; }
@@ -617,7 +619,7 @@
 			*)	GRADES="" ;;
 		esac
 		;;
-	roy)
+	roy|ceres)
 		GRADES="hlc.gc.tr hl.gc.tr"
 		;;
 	*)
@@ -779,7 +781,7 @@
 				hlc.gc hlc.par.gc" ;;
 		esac
 		;;
-	roy)
+	roy|ceres)
 		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"
 		# Test the asm_fast.gc.tr.rt grade, but not on the 0.10 branch,
@@ -909,6 +911,9 @@
 		;;
 	mars)	
 		fullname=i686-pc-linux-libc2.1-gnu-O5
+		;;
+	ceres)	
+		fullname=i686-pc-linux-libc2.1-gnu-O5-hlc
 		;;
 	roy)	
 		fullname=i686-pc-linux-libc2.1-gnu-O4-hlc
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------



More information about the reviews mailing list