[m-rev.] diff: copy profiler and slice dirs by default in bootchecks

[Julien Fischer]

Estimated hours taken: 0
Branches: main

tools/bootcheck:
 	Copy the profiler and slice directories by default rather than
 	just re-linking them.  This is more likely to make bootstraps
 	fail if there are errors in the build system.  The additional
 	time required by this is negligible.

 	Change the documentation to conform to the above.
 	Document the `--copy-slice' option.

tools/test_mercury:
 	Don't invoke the bootcheck script `--copy-profilers' since that
 	is enabled by default.

Julien.

Index: bootcheck
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/tools/bootcheck,v
retrieving revision 1.192
diff -u -r1.192 bootcheck
--- bootcheck	14 May 2007 08:14:02 -0000	1.192
+++ bootcheck	6 Jun 2007 06:43:23 -0000
@@ -75,9 +75,10 @@
          Copy the runtime directory instead of linking it.
          This is necessary if one wants to bootcheck a grade
          that is not compatible with the standard one.
-    -p, --copy-profilers
-        Copy the profiler directories instead of linking them.
-        This is sometimes necessary for bootstrapping changes.
+    -p-, --no-copy-profilers
+        Link the profiler directories instead of copying them.
+    --no-copy-slice
+        Link the slice directory instead of copying it.
      -b-, --no-bootcheck
          Do not run the bootstrap check; execute the test suite and/or
          the extras only. This option requires a previous bootstrap
@@ -185,8 +186,8 @@
  test_params=false
  copy_runtime=false
  copy_boehm_gc=false
-copy_slice=false
-copy_profilers=false
+copy_slice=true
+copy_profilers=true
  mmake_stage_2=true
  keep_stage_2=false
  keep_stage_3=false
@@ -313,11 +314,11 @@
      -g|--copy-boehm-gc)
          copy_boehm_gc=true ;;

-    -p|--copy-profilers)
-        copy_profilers=true ;;
+    -p-|-no-copy-profilers)
+        copy_profilers=false ;;

-    --copy-slice)
-        copy_slice=true ;;
+    --no-copy-slice)
+        copy_slice=false ;;

      --check-namespace)
          check_namespace=true ;;
Index: test_mercury
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/tools/test_mercury,v
retrieving revision 1.318
diff -u -r1.318 test_mercury
--- test_mercury	22 May 2007 07:53:51 -0000	1.318
+++ test_mercury	6 Jun 2007 06:43:23 -0000
@@ -673,7 +673,7 @@
  version=`mmake $target_opts version` || { false; exit 1; }
  fullarch=`mmake $target_opts fullarch` || { false; exit 1; }
  tools/bootcheck $use_cp_opt $target_opts \
-	--keep-objs --copy-runtime --copy-profilers \
+	--keep-objs --copy-runtime \
  	--no-test-suite $PARALLEL || $install_anyway || { false; exit 1; }
  cd .. || { false; exit 1; }



--------------------------------------------------------------------------
mercury-reviews mailing list
Post messages to:       mercury-reviews at csse.unimelb.edu.au
Administrative Queries: owner-mercury-reviews at csse.unimelb.edu.au
Subscriptions:          mercury-reviews-request at csse.unimelb.edu.au
--------------------------------------------------------------------------