[m-rev.] diff: fix problems with mercury-gcc dist

[Fergus Henderson]

Estimated hours taken: 1
Branches: main, release

tools/test_mercury:
	Fix some bugs in the code to install the mercury-gcc distribution
	on the web and ftp sites.
	Don't ignore failures of the --target asm tests any more
	(except on the 0.10 branch), since we now pass all such tests.

Workspace: /home/ceres/fjh/ws-ceres2/mercury
Index: tools/test_mercury
===================================================================
RCS file: /home/mercury1/repository/mercury/tools/test_mercury,v
retrieving revision 1.222
diff -u -d -r1.222 test_mercury
--- tools/test_mercury	24 Nov 2002 06:08:37 -0000	1.222
+++ tools/test_mercury	2 Dec 2002 07:29:24 -0000
@@ -834,6 +834,7 @@
 		mercury-gcc/mercury \
 		mercury-gcc/*.o &&
 	mv mercury-gcc mercury-gcc-$version &&
+	rm -f $UNSTABLE/mercury-gcc-$RELEASE_VERSION_PATTERN.tar.gz &&
 	tar -cf - mercury-gcc-$version | gzip -9 \
 		> $UNSTABLE/mercury-gcc-$version.tar.gz &&
 	mv mercury-gcc-$version mercury-gcc &&
@@ -921,11 +922,12 @@
 done
 case $HOST in hg)
 	echo "test_mercury starting tests for --target asm at `date`" 1>&2
-	# XXX Note that some of these tests are currently expected to fail
-	# with `--target asm' (in particular the tests of tabling and
-	# nested modules), so we don't set status=1 if these tests fail.
 	case $BRANCH in
 	    0.10)
+		# XXX Note that some of these tests are expected to fail
+		# on the 0.10 branch with `--target asm' (in particular
+		# the tests of tabling and nested modules), so we don't
+		# set status=1 if these tests fail.
 		./runtests --target asm -f "$TEST_MCFLAGS" -c "$TEST_CFLAGS" \
 			-g hlc.gc -m "$TEST_MGNUCFLAGS" -l "$TEST_MLFLAGS" \
 			$PARALLEL
@@ -936,7 +938,8 @@
 			EXTRA_CFLAGS="$TEST_CFLAGS" \
 			EXTRA_MGNUCFLAGS="$TEST_MGNUCFLAGS" \
 			EXTRA_MLFLAGS="$TEST_MLFLAGS" \
-			$PARALLEL runtests
+			$PARALLEL runtests \
+			|| set_status "tests of --target asm in grade $grade"
 		if [ -f runtests.errs ]; then
 			touch $TEST_ERROR_FILE
 			cat runtest.errs >> $TEST_ERROR_FILE
@@ -987,10 +990,11 @@
 case $HOST in $GCC_ROTD_HOST)
 	rsh $BETA_FTPHOST \
 		"rm -f $BETA_FTPDIR/mercury-gcc-$RELEASE_VERSION_PATTERN-unstable.tar.gz" &&
-	rcp $UNSTABLE/mercury-gcc-$version-unstable.* \
-		$BETA_FTPHOST:$BETA_FTPDIR  &&
+	rcp $UNSTABLE/mercury-gcc-$version.tar.gz \
+	    $BETA_FTPHOST:$BETA_FTPDIR/mercury-gcc-$version-unstable.tar.gz  &&
 	rm -f $BETA_WEBDIR/mercury-gcc-$RELEASE_VERSION_PATTERN-unstable.tar.gz &&
-	cp $UNSTABLE/mercury-gcc-$version-unstable.* $BETA_WEBDIR
+	cp $UNSTABLE/mercury-gcc-$version.tar.gz \
+		$BETA_WEBDIR/mercury-gcc-$version-unstable.tar.gz
 	;;
 esac
 
@@ -1206,7 +1210,7 @@
 	    $LN $BETA_WEBDIR/mercury-INSTALL-$version-unstable.txt \
 	        $BETA_WEBDIR/mercury-INSTALL-$version.txt
 	    ;;
-	esac || set_status "updating stable distribution"
+	esac || set_status "updating stable mercury source distribution"
 
 	case $HOST in $GCC_ROTD_HOST)
 	    cd $DIR &&
@@ -1226,7 +1230,7 @@
 	    $LN $BETA_WEBDIR/mercury-gcc-$version-unstable.tar.gz \
 	        $BETA_WEBDIR/mercury-gcc-$version.tar.gz
 	    ;;
-	esac
+	esac || set_status "updating stable mercury-gcc source distribution"
 	;;
     *)
 	;;

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