[m-rev.] diff: make aral the rotd host

[Julien Fischer]

tools/run_all_test_from_cron:
tools/test_mercury:
 	Make aral the ROTD host.

 	Delete stuff related to dead hosts.

Julien.

Index: run_all_tests_from_cron
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/tools/run_all_tests_from_cron,v
retrieving revision 1.85
diff -u -r1.85 run_all_tests_from_cron
--- run_all_tests_from_cron	6 Jan 2009 06:54:06 -0000	1.85
+++ run_all_tests_from_cron	15 Apr 2009 06:10:16 -0000
@@ -104,16 +104,13 @@
  		#esac
  		BRANCH=latest
  		;;
-	   jupiter)
+	   aral)
  		BRANCH=latest
  		#case $DAY in
  		#	*[13579]) BRANCH=$release_branch ;;
  		#	*) BRANCH=latest ;;
  		#esac
  	   	;;
-	   swordfish)
-		BRANCH=latest
-		;;
  	   saturn|neptune|goofy|eris)
   	       	BRANCH=latest
  		#case $DAY in
Index: test_mercury
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/tools/test_mercury,v
retrieving revision 1.348
diff -u -r1.348 test_mercury
--- test_mercury	17 Mar 2009 07:14:33 -0000	1.348
+++ test_mercury	15 Apr 2009 06:08:45 -0000
@@ -106,7 +106,7 @@

  # Host to use to build the release of the day source distribution
  # for the mercury-compiler, mercury-tests, and mercury-extras distributions.
-ROTD_HOST=jupiter
+ROTD_HOST=aral

  # Host to use to build the release of the day mercury-gcc source distribution.
  # We don't currently test the gcc backend.
@@ -232,7 +232,7 @@
  case $HOST in
      # test things at different optimization levels...

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

@@ -248,10 +248,6 @@
          OPTIMIZE="-O2 --intermodule-optimization"
          ;;

-    swordfish)
-        OPTIMIZE="-O4 --constraint-propagation" 
-        ;;
-
      mundula)
          OPTIMIZE=-O2; use_cp_opt="--use-cp"
          # On mundroo, "mkdir -p scripts" aborts
@@ -313,7 +309,7 @@
  # So if you modify this list of hosts, you need to also modify
  # run_all_tests_from_cron.
  case $HOST in
-    jupiter|swordfish|saturn|neptune|goofy|taura|bob|goliath)
+    aral|saturn|neptune|goofy|taura|bob|goliath)
          INSTALL_DIR=/home/$HOST/public/$INSTALL_DIR_NAME/$FULLARCH
          ;;

@@ -463,24 +459,9 @@
              asm_fast.gc.stseg               \
              reg.gc.tr"
          ;;
- 
-    jupiter)
-        # Ensure that the nogc grades get installed and tested
-        # on at least one host
+    aral)
          CONFIG_OPTS="--with-cc=/usr/bin/gcc-3.4"
          ;;
-    swordfish)
-        # swordfish is being used by the G12 group at the moment, so
-        # it requires trailing versions of most of the grades.
-        CONFIG_OPTS="--with-cc=/usr/bin/gcc-3.4 --disable-java-grade"
-        INSTALL_LIBGRADES="asm_fast.gc      \
-            hlc.gc.trseg                    \
-            hlc.gc.trseg.prof               \
-            asm_fast.gc.tr                  \
-            asm_fast.gc.tr.profdeep         \
-            asm_fast.gc.tr.decldebug        \
-            hlc.gc"
-        ;;
      eris)
          # The asm_fast grades don't work on Darwin.
          # The reg grades don't work with the default gcc compiler
@@ -999,11 +980,8 @@
  # Also we distinguish them based on what optimization level
  # they were compiled with.
  case $HOST in
-    jupiter) 
-        fullname=i686-pc-linux-libc2.3-gnu-O5-intermod
-        ;;
-    swordfish)
-        fullname=i686-pc-linux-libc2.3-gnu-O4-intermod
+    aral) 
+        fullname=i686-pc-linux-libc2.7-gnu-O2-intermod
          ;;
      saturn)
          fullname=x86_64-unknown-linux-gnu-libc2.3-gnu-O5-intermod

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