[m-rev.] diff: fix a problem with mundroo's nightly test

[Zoltan Somogyi]

tools/bootcheck:
	Add an option, --use-cp, for replacing ln -s with cp.
	(The infrastructure was already there, to support windows.)

tools/test_mercury:
	Enable --use-cp for mundroo, since bookcheck fails without it
	when config.status executes a mkdir -p in stage2.

Zoltan.

Index: tools/bootcheck
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/tools/bootcheck,v
retrieving revision 1.159
diff -u -b -r1.159 bootcheck
--- tools/bootcheck	19 May 2004 04:00:00 -0000	1.159
+++ tools/bootcheck	11 Jun 2004 07:00:03 -0000
@@ -323,6 +323,9 @@
 	-W|--windows)
 		windows=true; use_cp=true; A=lib ;;
 
+	--use-cp)
+		use_cp=true ;;
+
 	--no-sym-links)
 		use_cp=true ;;
 
Index: tools/test_mercury
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/tools/test_mercury,v
retrieving revision 1.245
diff -u -b -r1.245 test_mercury
--- tools/test_mercury	8 Feb 2004 05:03:11 -0000	1.245
+++ tools/test_mercury	11 Jun 2004 07:04:51 -0000
@@ -195,6 +195,7 @@
 
 #-----------------------------------------------------------------------------#
 
+use_cp_opt=""
 case $HOST in
 	# test things at different optimization levels...
 
@@ -220,7 +221,9 @@
 
 	murlibobo)	OPTIMIZE=-O5 ;;
 	taifun) 	OPTIMIZE=-O1 ;;
-	mundroo) 	OPTIMIZE=-O2 ;;
+	mundroo) 	OPTIMIZE=-O2; use_cp_opt="--use-cp" ;;
+			# On mundroo, "mkdir -p scripts" aborts
+			# if scripts is a symbolic link to a directory.
 	quicksilver) 	OPTIMIZE=-O0 ;;
 	hg) 		OPTIMIZE=-O4 ;;
 	roy) 		OPTIMIZE=-O4 ;;	# hlc
@@ -680,7 +683,8 @@
 mmake $target_opts depend $PARALLEL || { false; exit 1; }
 version=`mmake $target_opts version` || { false; exit 1; }
 fullarch=`mmake $target_opts fullarch` || { false; exit 1; }
-tools/bootcheck $target_opts --keep-objs --copy-runtime --copy-profiler \
+tools/bootcheck $use_cp_opt $target_opts \
+	--keep-objs --copy-runtime --copy-profiler \
 	--no-test-suite $PARALLEL || $install_anyway || { false; exit 1; }
 cd .. || { false; exit 1; }
 
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------