[m-rev.] trivial diff: more test_mercury stuff for neptune and pluto

[Julien Fischer]

Estimated hours taken: 0.1
Branches: main

tools/test_mercury:
 	On neptune and pluto look for the installed compiler in the
 	correct directory.

 	Remove some stuff related to the 0.12 branch.

Julien.

Index: test_mercury
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/tools/test_mercury,v
retrieving revision 1.311
diff -u -r1.311 test_mercury
--- test_mercury	19 Jan 2007 06:12:52 -0000	1.311
+++ test_mercury	19 Jan 2007 07:05:06 -0000
@@ -198,21 +198,6 @@
  		RELEASE_VERSION=0.13.1
  		RELEASE_VERSION_PATTERN=0.13.1*
  		;;
-	0.12)
-		#CHECKOUT_OPTS=-rversion-0_12-branch
-		#BASE_TAG_NAME=version-0_12-branch
-		#FTP_DIR_NAME=0.12.2-beta
-		#RELEASE_VERSION=0.12.2-beta-$DATE
-		#RELEASE_VERSION_PATTERN=0.12.2-beta-*
-
-		# This is for release 0.12.2 itself
-		# (as opposed to beta releases).
-		CHECKOUT_OPTS=-rversion-0_12_2
-		BASE_TAG_NAME=version-0_12_2
-		FTP_DIR_NAME=0.12.2
-		RELEASE_VERSION=0.12.2
-		RELEASE_VERSION_PATTERN=0.12.2*
-		;;
  esac
  case "$C_COMPILER" in
  	gcc)	TEST_ID=$BRANCH.$HOST
@@ -289,7 +274,7 @@
  # So if you modify this list of hosts, you need to also modify
  # run_all_tests_from_cron.
  case $HOST in
-	earth|ceres|aral|jupiter|swordfish|saturn|uranus)
+	earth|ceres|aral|jupiter|swordfish|saturn|uranus|neptune|pluto)
  		INSTALL_DIR=/home/$HOST/public/$INSTALL_DIR_NAME/$FULLARCH ;;
  	*)
  		INSTALL_DIR=$TOPDIR/$INSTALL_DIR_NAME/$FULLARCH ;;
@@ -323,14 +308,6 @@
  # Normally we use the compiler from same location that we will install in.
  # But occasionally this setting will get overridden below.
  case $BRANCH in
-	# The directory structure of the installed distribution is
-	# different for the 0.12 branch than for the main branch.
-	0.12*)
-		if test -x $INSTALL_DIR/lib/mercury/bin/$FULLARCH/mercury_compile
-		then
-			BOOTSTRAP_MERCURY_COMPILER=$INSTALL_DIR/lib/mercury/bin/$FULLARCH/mercury_compile
-		fi
-		;;
  	*)
  		if test -x $INSTALL_DIR/bin/mercury_compile
  		then

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