[m-rev.] diff: bootcheck --delete-deep-data

[Zoltan Somogyi]

tools/bootcheck:
	Do not delete Deep.data files by default; do it only if either the user
	specifies the option --delete-deep-data, or if the directory contains a
	.DELETE_DEEP_DATA file.

	If the user specifies --delete-deep-data, delete Deep.procrep files as
	well, since they are not of much use without the matching Deep.data
	files.

Zoltan.

cvs diff: Diffing .
Index: bootcheck
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/tools/bootcheck,v
retrieving revision 1.205
diff -u -b -r1.205 bootcheck
--- bootcheck	31 Jul 2008 03:20:54 -0000	1.205
+++ bootcheck	3 Oct 2008 03:45:08 -0000
@@ -147,14 +147,13 @@
         Make the trace, browser, ssdb libraries empty. This can be useful
         when trying to track down the reason why they are being linked
         into the compiler in the first place.
-    --keep-deep-data
-        Keep the Deep.data files resulting from the bootcheck. The
-        usual behavior is to delete them in the interest of conserving
-        disk space.
+    --delete-deep-data
+        Delete any Deep.data and Deep.procrep files created by the bootcheck,
+        in the interest of conserving disk space.
     --deep-all-write
         In deep profiling grades, write out the profiling tree on every
         invocation. (The default is to write it out only for every 25th
-        invocation, on average.
+        invocation, on average.)
     --deep-debug
         Turn on the flag that enables debugging output from the deep
         profiling runtime.
@@ -214,7 +213,7 @@
 trace_count=false
 coverage_test=false
 disable_debug_libs=false
-delete_deep_data=true
+delete_deep_data=false
 deep_write_sample=true
 deep_debug=false
 progress=false
@@ -224,6 +223,11 @@
     keep_objs=true
 fi
 
+if test -f .DELETE_DEEP_DATA
+then
+    delete_deep_data=true
+fi
+
 if test -f .BOOT_GRADE
 then
     grade=`cat .BOOT_GRADE`
@@ -392,8 +396,8 @@
     --disable-debug-libs)
         disable_debug_libs=true ;;
 
-    --keep-deep-data)
-        delete_deep_data=false ;;
+    --delete-deep-data)
+        delete_deep_data=true ;;
 
     --deep-all-write)
         deep_write_sample=false ;;
@@ -1766,7 +1770,9 @@
 
 if $delete_deep_data
 then
-    (cd $root; find stage2 tests -name Deep.data -print | xargs /bin/rm -f)
+    (cd $root; \
+        find stage2 tests -name Deep.data -o -name Deep.procrep -print \
+        | xargs /bin/rm -f)
 fi
 
 #-----------------------------------------------------------------------------#
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------