[m-rev.] for review: fix nightly test procedure

[Fergus Henderson]

Estimated hours taken: 2
Branches: main, release

tools/test_mercury:
	Fix a bug where it was running the tests in the test suite
	and the clpr and trailed_update tests using the scripts
	in mercury-latest/$FULLARCH/bin,
	rather than using the compiler and scripts
	that we just bootstrapped and installed, which may be installed
	in a different location, e.g. mercury-0.11/$FULLARCH-$C_COMPILER/bin.

Workspace: /home/ceres/fjh/ws-ceres2/mercury
Index: tools/test_mercury
===================================================================
RCS file: /home/mercury1/repository/mercury/tools/test_mercury,v
retrieving revision 1.219.2.1
diff -u -d -r1.219.2.1 test_mercury
--- tools/test_mercury	21 Nov 2002 06:34:04 -0000	1.219.2.1
+++ tools/test_mercury	23 Nov 2002 09:28:29 -0000
@@ -710,6 +710,19 @@
 
 #-----------------------------------------------------------------------------#
 
+# The stage2 compiler got installed, so we don't need to set
+# MERCURY_COMPILER now.
+# In fact, we should unset it, so it isn't set to something
+# inappropriate by some other part of this script.
+# Instead we just need to make sure that the compiler that we
+# just installed is first in the PATH.
+# From here-on in, we use the compiler that we just built and
+# installed, not the bootstrap compiler.
+
+unset MERCURY_COMPILER
+
+PATH="$INSTALL_DIR/bin:$PATH"
+
 GRADES="`(cd $DIR/mercury && mmake echo_libgrades)`"
 case $HOST in
    hg)
@@ -717,7 +730,10 @@
 	;;
 esac
 
+#-----------------------------------------------------------------------------#
+
 : test and install the CLPR interface
+
 # CLPR requires trailing, so here we only test the trailing grades.
 # XXX The CLPR interface currently also requires GCC (see the #error in
 # extras/clpr/cfloat.m), so we test it only if we're using GCC.
@@ -765,8 +781,6 @@
 
 echo "test_mercury starting to create distribution at `date`" 1>&2
 
-MERCURY_COMPILER=$BOOTSTRAP_MERCURY_COMPILER
-export MERCURY_COMPILER
 case $HOST in $ROTD_HOST)
 	# The tests on earth are run with `--intermodule-optimization',
 	# so we need to do a `mmake realclean' before building the C files
@@ -817,16 +831,9 @@
 	;;
 esac
 
-: run the regression tests on the stage2 compiler
-
-# The stage2 compiler got installed, so we don't need to set this.
-# In fact, we should unset it, so it isn't set to something
-# inappropriate by some other part of this script.
-
-unset MERCURY_COMPILER
+#-----------------------------------------------------------------------------#
 
-#MERCURY_COMPILER=$DIR/mercury/stage2/compiler/mercury_compile
-#export MERCURY_COMPILER
+: run the regression tests on the installed compiler
 
 cd tests || { false; exit 1; }
 

-- 
Fergus Henderson <fjh at cs.mu.oz.au>  |  "I have always known that the pursuit
The University of Melbourne         |  of excellence is a lethal habit"
WWW: <http://www.cs.mu.oz.au/~fjh>  |     -- the last words of T. S. Garp.
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------