[m-rev.] for review: fix test_mercury

[Ian MacLarty]

For review by anyone.

Estimated hours taken: 0.2
Branches: main

tools/test_mercury:
	Make the overnight tests looks for the bootstrap compiler in
	different locations based on the branch being tested.

Index: tools/test_mercury
===================================================================
RCS file: /home/mercury1/repository/mercury/tools/test_mercury,v
retrieving revision 1.260
diff -u -r1.260 test_mercury
--- tools/test_mercury	25 Oct 2005 10:17:29 -0000	1.260
+++ tools/test_mercury	26 Oct 2005 05:48:39 -0000
@@ -305,10 +305,22 @@
 # Version of the mercury compiler to use for bootstrapping
 # Normally we use the compiler from same location that we will install in.
 # But occasionally this setting will get overridden below.
-if test -x $INSTALL_DIR/bin/mercury_compile
-then
-	BOOTSTRAP_MERCURY_COMPILER=$INSTALL_DIR/bin/mercury_compile
-fi
+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
+			BOOTSTRAP_MERCURY_COMPILER=$INSTALL_DIR/bin/mercury_compile
+		fi
+		;;
+esac

 # The following can be edited and uncommented if you need to use
 # a different bootstrap compiler to re-bootstrap a host which

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