[m-rev.] for review/diff: update and cleanup test_mercury script

[Mark Brown]

(Hmm.  I sent this from jupiter about half an hour ago, but it doesn't seem
to have got through.  Anyone know if jupiter has a working MTA?  Actually,
it's SuSE -- forget I asked  :-S)

The following change has been causing installation failures on swordfish
with the following error message:

	/home/mercury/public/mercury-latest/i686-pc-linux-gnu/bin/mmake: line
	382: gmake: command not found

Probably it would cause similar problems on saturn.  The diff below undoes
the change from cp to mv.

Cheers,
Mark.

On 27-Aug-2005, Julien Siegfried FISCHER <juliensf at cs.mu.OZ.AU> wrote:
> @@ -732,8 +676,9 @@
>      # Make a backup copy of the current installation which we will restore
>      # if the new installation fails.
> 
> -    mkdir -p $INSTALL_DIR/../mercury_install_backup
> -    cp -rf $INSTALL_DIR/* $INSTALL_DIR/../mercury_install_backup
> +    BACKUP_DIR=`dirname $INSTALL_DIR`/mercury_install_backup
> +    mv $INSTALL_DIR $BACKUP_DIR
> +    mkdir -p $INSTALL_DIR
> 
>      # Previously we had lots of special case code here for installing on
>      # IRIX systems.   We don't currently have any IRIX boxes, and this

Estimated hours taken: 0.5
Branches: main

tools/test_mercury:
	Undo a recent change to the part of this script which makes a backup
	of the current installation.  The previous change was to `mv' the
	installation into the backup directory instead of `cp'ing it.  The
	purpose of this was to save disk space.  Unfortunately, this doesn't
	work because later commands, which use mmake, need to use an mmake
	which is configured for the machine in question.

	The disk space issue is not so serious now because we have freed up
	space on ceres.  We may need to reinstate the earlier change if space
	becomes a problem again, but it will need to be done more cleverly.

Index: tools/test_mercury
===================================================================
RCS file: /home/mercury1/repository/mercury/tools/test_mercury,v
retrieving revision 1.256
diff -u -r1.256 test_mercury
--- tools/test_mercury	8 Sep 2005 09:06:03 -0000	1.256
+++ tools/test_mercury	14 Sep 2005 02:30:53 -0000
@@ -680,8 +680,8 @@
     # if the new installation fails.
 
     BACKUP_DIR=`dirname $INSTALL_DIR`/mercury_install_backup
-    mv $INSTALL_DIR $BACKUP_DIR
-    mkdir -p $INSTALL_DIR
+    mkdir -p $BACKUP_DIR
+    cp -rf $INSTALL_DIR/* $BACKUP_DIR
 
     # Previously we had lots of special case code here for installing on
     # IRIX systems.   We don't currently have any IRIX boxes, and this 
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------