[m-rev.] trivial diff: update test_mercury and friends for eris

[Julien Fischer]

eris is one of the new machines; its details are in local/hosts.

tools/run_all_tests_from_cron:
tools/test_mercury:
 	Initial changes to get nightly builds running on eris.

Julien.

Index: run_all_tests_from_cron
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/tools/run_all_tests_from_cron,v
retrieving revision 1.81
diff -u -r1.81 run_all_tests_from_cron
--- run_all_tests_from_cron	21 Aug 2007 04:39:51 -0000	1.81
+++ run_all_tests_from_cron	6 Dec 2007 05:31:46 -0000
@@ -40,7 +40,11 @@
  	TOPDIR=/home/mercury/public
  	PATH="$HOME/bin/$ARCH`awk '/^[^#]/{printf ":%s",$0;}' $TOPDIR/cron/.path`"
  else
-	TOPDIR=$HOME/public
+	case "$HOST" in
+		# The repeated `mercury' for eris is deliberate.
+		eris) TOPDIR=/Users/mercury/mercury/public ;;
+		*) TOPDIR=$HOME/public ;;
+	esac
  fi
  PATH="$TOPDIR/mercury-latest/$FULLARCH/bin:$PATH"
  PATH="$TOPDIR/$HOST:$PATH"
@@ -48,12 +52,12 @@
  PATH="$PATH:/usr/bin"
  export PATH

-CVSROOT=/home/mercury1/repository
+CVSROOT=/home/mercury/mercury1/repository
  if [ -d $CVSROOT/. ]; then
  	:
  else
  	case "$HOST" in
-	neptune|pluto)
+	neptune|pluto|eris)
  	    CVSROOT=":ext:mercury at cvs.mercury.csse.unimelb.edu.au:$CVSROOT"
  	    ;;
  	*)
@@ -72,6 +76,7 @@

  [ -d $TOPDIR/test_mercury/scripts ] || mkdir -p $TOPDIR/test_mercury/scripts
  cd $TOPDIR/test_mercury/scripts
+
  cvs checkout mercury/tools/test_mercury
  cp mercury/tools/test_mercury $tmpscript

@@ -115,7 +120,7 @@
  	   uranus|swordfish)
  		BRANCH=latest
  		;;
-	   saturn|neptune|pluto)
+	   saturn|neptune|pluto|eris)
   	       	BRANCH=latest
  		#case $DAY in
  		#	*[02468]) BRANCH=$release_branch ;;
Index: test_mercury
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/tools/test_mercury,v
retrieving revision 1.325
diff -u -r1.325 test_mercury
--- test_mercury	28 Oct 2007 11:15:32 -0000	1.325
+++ test_mercury	6 Dec 2007 05:31:46 -0000
@@ -16,7 +16,8 @@
  	*)	echo "Usage: $0 host arch fullarch branch c_compiler use_mmc_make" 1>&2; exit 1 ;;
  esac

-if [ -d /home/mercury/public/. ]; then
+if test -d /home/mercury/public/.
+then
  	TOPDIR=/home/mercury/public
  	PATH="$HOME/bin/$ARCH`awk '/^[^#]/{printf ":%s",$0;}' $TOPDIR/cron/.path`"
  	PATH="$TOPDIR/mercury-latest/$FULLARCH/bin:$PATH"
@@ -29,6 +30,12 @@
  	# generate_index_html needs to be in our PATH too
  	PATH="$TOPDIR/test_mercury/scripts:$PATH"
  else
+	case "$HOST" in
+	    eris)
+	        HOME=/Users/mercury/mercury
+		;;
+	esac
+
  	TOPDIR=$HOME/public
  	PATH=$TOPDIR/mercury-latest/$FULLARCH/bin:$PATH
  	PATH="$TOPDIR/$FULLARCH:$PATH"
@@ -48,7 +55,7 @@
  	:
  else
  	case "$HOST" in
-	    neptune|pluto)
+	    neptune|pluto|eris)
  	    CVSROOT=":ext:mercury at cvs.mercury.csse.unimelb.edu.au:$CVSROOT"
  	    ;;
  	    *)

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