[m-rev.] trivial diff: get saturn to build 10.04 tarballs

[Julien Fischer]

tools/run_all_tests_from_cron:
tools/test_mercury:
	Build 10.04 beta tarballs on saturn every other day.

	Strip out some stuff related to aral.

Julien.

Index: run_all_tests_from_cron
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/tools/run_all_tests_from_cron,v
retrieving revision 1.87
diff -u -r1.87 run_all_tests_from_cron
--- run_all_tests_from_cron	6 Mar 2010 14:20:26 -0000	1.87
+++ run_all_tests_from_cron	18 Mar 2010 07:21:32 -0000
@@ -104,19 +104,11 @@
 		#esac
 		BRANCH=latest
 		;;
-	   aral)
-		BRANCH=latest
-		#case $DAY in
-		#	*[13579]) BRANCH=$release_branch ;;
-		#	*) BRANCH=latest ;;
-		#esac
-	   	;;
-	   saturn|neptune|goofy|eris)
- 	       	BRANCH=latest
-		#case $DAY in
-		#	*[02468]) BRANCH=$release_branch ;;
-		#        *) BRANCH=latest ;;
-	       	#esac
+	   saturn)
+		case $DAY in
+			*[02468]) BRANCH=$release_branch ;;
+		        *) 	  BRANCH=latest ;;
+	       	esac
 	       	;;
 	   *)
 	    	# On anything else just test the main branch.
Index: test_mercury
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/tools/test_mercury,v
retrieving revision 1.369
diff -u -r1.369 test_mercury
--- test_mercury	6 Mar 2010 14:20:26 -0000	1.369
+++ test_mercury	18 Mar 2010 07:22:39 -0000
@@ -229,7 +229,7 @@
 case $HOST in
     # test things at different optimization levels...

-    $ROTD_HOST|aral)
+    $ROTD_HOST)
         OPTIMIZE="-O2 --intermodule-optimization"
         ;;

@@ -306,7 +306,7 @@
 # So if you modify this list of hosts, you need to also modify
 # run_all_tests_from_cron.
 case $HOST in
-    aral|saturn|neptune|goofy|taura|bob|goliath)
+    saturn|neptune|goofy|taura|bob|goliath)
         INSTALL_DIR=/home/$HOST/public/$INSTALL_DIR_NAME/$FULLARCH
         ;;

@@ -458,9 +458,6 @@
             hl.gc                           \
             hl.par.gc"
         ;;
-    aral)
-        CONFIG_OPTS="--with-cc=/usr/bin/gcc-3.4"
-        ;;
     eris)
         # The asm_fast grades don't (yet) work on Darwin.
         # XXX The reg grades cause heap exhaustion on Mac OS 10.6.
@@ -1002,11 +999,8 @@
 # Also we distinguish them based on what optimization level
 # they were compiled with.
 case $HOST in
-    aral)
-        fullname=i686-pc-linux-libc2.7-gnu-O2-intermod
-        ;;
     saturn)
-        fullname=x86_64-unknown-linux-gnu-libc2.7-gnu-O5-intermod
+        fullname=x86_64-unknown-linux-gnu-libc2.7-gnu-O2-intermod
         ;;
     neptune)
         fullname=x86_64-unknown-linux-gnu-libc2.9-gnu-O4
--------------------------------------------------------------------------
mercury-reviews mailing list
Post messages to:       mercury-reviews at csse.unimelb.edu.au
Administrative Queries: owner-mercury-reviews at csse.unimelb.edu.au
Subscriptions:          mercury-reviews-request at csse.unimelb.edu.au
--------------------------------------------------------------------------