[m-rev.] trivial diff: fix release branch test failures

[Simon Taylor]

On 14-Feb-2003, Fergus Henderson <fjh at cs.mu.OZ.AU> wrote:
> On 14-Feb-2003, Simon Taylor <stayl at cs.mu.OZ.AU> wrote:
> > +++ test_mercury	14 Feb 2003 06:00:13 -0000
> > @@ -264,7 +264,14 @@
> >  		# On x86 Unix, we need to set the following flags to enable
> >  		# shared libraries (and we need to use shared libraries to
> >  		# avoid running out of disk space...)
> > -		TEST_MCFLAGS="$TEST_MCFLAGS --mercury-linkage shared"
> > +		case $BRANCH in
> > +		    latest)
> > +			TEST_MCFLAGS="$TEST_MCFLAGS --mercury-linkage shared"
> > +		    	;;
> > +		    *)
> > +			TEST_MCFLAGS="$TEST_MCFLAGS --pic-reg"
> > +			;;
> > +		esac
> 
> This will break as soon as we start testing the 0.12 branch.
> 
> The test should be reverse -- you should test for the 0.11 branch rather
> than testing for the latest branch.

Index: test_mercury
===================================================================
RCS file: /home/mercury1/repository/mercury/tools/test_mercury,v
retrieving revision 1.236
diff -u -u -r1.236 test_mercury
--- test_mercury	14 Feb 2003 06:01:45 -0000	1.236
+++ test_mercury	14 Feb 2003 06:28:26 -0000
@@ -265,12 +265,12 @@
 		# shared libraries (and we need to use shared libraries to
 		# avoid running out of disk space...)
 		case $BRANCH in
-		    latest)
-			TEST_MCFLAGS="$TEST_MCFLAGS --mercury-linkage shared"
-		    	;;
-		    *)
+		    0.11)
 			TEST_MCFLAGS="$TEST_MCFLAGS --pic-reg"
 			;;
+		    *)
+			TEST_MCFLAGS="$TEST_MCFLAGS --mercury-linkage shared"
+		    	;;
 		esac
 		TEST_MGNUCFLAGS="$TEST_MGNUCFLAGS --pic-reg"
 		TEST_MLFLAGS="$TEST_MLFLAGS --shared"
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------