[m-rev.] diff: run weekly tests on mundula

[Julien Fischer]

Estimated hours taken: 0.5
Branches: main

tools/test_mercury:
	Setup for running weekly tests on mundula.  We need to do this because
	mundroo is scheduled to be shutdown at some point (December?).

	Prepare for the 0.12.1 release.

	Remove stuff related to roy and hg since we've retired both of them.

	Fix up various bits of rot in this script (mainly due to OS reinstalls
	on various machines in the past couple of months).

	Remove various workarounds for boostrapping broken installations.

Julien.

Index: test_mercury
===================================================================
RCS file: /home/mercury1/repository/mercury/tools/test_mercury,v
retrieving revision 1.264
diff -u -r1.264 test_mercury
--- test_mercury	31 Oct 2005 07:12:44 -0000	1.264
+++ test_mercury	3 Nov 2005 01:59:32 -0000
@@ -33,7 +33,7 @@
 	PATH="$TOPDIR/$FULLARCH:$PATH"
 	PATH="$TOPDIR/$HOST:$PATH"
 fi
-case $HOST in mundroo*)
+case $HOST in mundroo*|mundula)
 	PATH="/usr/local/apps/ssh-1.2.32/bin:$PATH"
 	;;
 esac
@@ -171,28 +171,13 @@
 		RELEASE_VERSION=0.12.1-beta-$DATE
 		RELEASE_VERSION_PATTERN=0.12.1-beta-*

-		# This is for release 0.12.0 itself
+		# This is for release 0.12.1 itself
 		# (as opposed to beta releases).
-		#CHECKOUT_OPTS=-rversion-0_12_0
-		#BASE_TAG_NAME=version-0_12_0
-		#FTP_DIR_NAME=0.12.0
-		#RELEASE_VERSION=0.12.0
-		#RELEASE_VERSION_PATTERN=0.12.0*
-		;;
-	0.11)
-		CHECKOUT_OPTS=-rversion-0_11-branch
-		BASE_TAG_NAME=version-0_11-branch
-		FTP_DIR_NAME=0.11.1-beta
-		RELEASE_VERSION=0.11.1-beta-$DATE
-		RELEASE_VERSION_PATTERN=0.11.1-beta-*
-
-		# This is for release 0.11.0 itself
-		# (as opposed to beta releases).
-		#CHECKOUT_OPTS=-rversion-0_11_0
-		#BASE_TAG_NAME=version-0_11_0
-		#FTP_DIR_NAME=0.11.0
-		#RELEASE_VERSION=0.11.0
-		#RELEASE_VERSION_PATTERN=0.11.0*
+		#CHECKOUT_OPTS=-rversion-0_12_1
+		#BASE_TAG_NAME=version-0_12_1
+		#FTP_DIR_NAME=0.12.1
+		#RELEASE_VERSION=0.12.1
+		#RELEASE_VERSION_PATTERN=0.12.1*
 		;;
 esac
 case "$C_COMPILER" in
@@ -219,7 +204,8 @@
 	earth)		OPTIMIZE="-O2" ;;
 	saturn)		OPTIMIZE="-O5 --intermodule-optimization" ;;
 	swordfish)	OPTIMIZE="-O4 --intermodule-optimization --constraint-propagation" ;;
-	mundroo) 	OPTIMIZE=-O2; use_cp_opt="--use-cp" ;;
+	mundroo|mundula)
+			OPTIMIZE=-O2; use_cp_opt="--use-cp" ;;
 			# On mundroo, "mkdir -p scripts" aborts
 			# if scripts is a symbolic link to a directory.
 	aral)		OPTIMIZE="-O3" ;;
@@ -328,31 +314,10 @@
 		;;
 esac

-# The following can be edited and uncommented if you need to use
-# a different bootstrap compiler to re-bootstrap a host which
-# has gotten too out-of-date.
-#case $HOST in mars)
-#	BOOTSTRAP_MERCURY_COMPILER=$TOPDIR/$INSTALL_DIR_NAME/$FULLARCH/bin/mercury_compile
-#		;;
-#esac
-
-# For bootstrapping the 0.12 branch on mundroo - since there isn't a 0.12
-# compiler currently installed.
-case $HOST in mundroo)
-	PATH=/home/mercury/public/mercury-latest/i386-pc-solaris2.8/bin:$PATH
-	;;
-esac
-
-# for bootstrapping only
-#case $HOST in aral)
-#	PATH=/home/jupiter/public/mercury-latest/i686-pc-linux-gnu/bin:$PATH
-#	;;
-#esac
-
 # df (disk free) command
 DF=df
 case $HOST in
-	mundroo) DF="df -k" ;;
+	mundroo|mundula) DF="df -k" ;;
 esac

 #-----------------------------------------------------------------------------#
@@ -407,7 +372,7 @@
 		# to work
 		CONFIG_OPTS="--enable-hlc-prof-grades \
 			--enable-new-mercuryfile-struct" ;;
-	roy|ceres)
+	ceres)
 		# On these hosts, test the high-level back-end more:
 		# bootstrap the compiler in hlc.gc,
 		# use hlc.gc as the default grade,
@@ -424,15 +389,6 @@
 					asm_fast.gc.tr	\
 					asm_fast.gc.tr.debug"
 		;;
-	hg)
-		CONFIG_OPTS=""
-		case "$C_COMPILER" in asm)
-			# Build the compiler in grade hlc.gc, because
-			# --target asm requires an hl* grade.
-			INSTALL_GRADE="hlc.gc"
-			;;
-		esac
-		;;
 	jupiter)
 		# Ensure that the nogc grades get installed and tested
 		# on at least one host
@@ -1044,27 +1000,24 @@
 # Also we distinguish them based on what optimization level
 # they were compiled with.
 case $HOST in
-	hg)
-		fullname=i686-pc-linux-libc2.1-gnu-O4
-		;;
-	earth|jupiter)
+	jupiter)
 		fullname=i686-pc-linux-libc2.2-gnu-O5-intermod
 		;;
+	earth)
+		fullname=i686-pc-linux-libc2.3-gnu-O2
+		;;
 	swordfish)
-		fullname=i686-pc-linux-libc2.2-gnu-O5
+		fullname=i686-pc-linux-libc2.3-gnu-O4-intermod
 		;;
 	ceres)
 		fullname=i686-pc-linux-libc2.3-gnu-O5-hlc
 		;;
 	aral)
-		fullname=i686-pc-linux-libc2.3-gnu-O5
+		fullname=i686-pc-linux-libc2.3-gnu-O3
 		;;
 	saturn)
 		fullname=x86_64-unknown-linux-gnu-libc2.3
 		;;
-	roy)
-		fullname=i686-pc-linux-libc2.1-gnu-O4-hlc
-		;;
 	ender)
 		fullname=i686-pc-linux-libc2.1-gnu-O3
 		;;

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