[m-rev.] for review: use `-t-' rather than `-t' in tools/*

[Fergus Henderson]

Estimated hours taken: 0.5
Branches: main

tools/bootcheck:
tools/binary:
tools/binary_step:
tools/linear:
tools/makebatch:
tools/test_mercury:
	Change the options for these tools so that the short form of
	negative options, such as `--no-test-suite', is `-t-' rather
	than `-t', for consistency with the option handling convention
	used by other Mercury programs such as `mmc' and `ml'.

	I made this change because I found it very confusing
	that `-t' *disabled* the tests in the `tests' directory,
	whereas `-e' *enabled* the tests in the `extras' directory.
	With this change, all options that disable things
	are now of the form `-<letter>-' or `--no-<long-name>'.

Workspace: /home/ceres/fjh/mercury
Index: tools/binary
===================================================================
RCS file: /home/mercury1/repository/mercury/tools/binary,v
retrieving revision 1.21
diff -u -d -r1.21 binary
--- tools/binary	5 Nov 2001 06:06:20 -0000	1.21
+++ tools/binary	11 Dec 2001 10:27:25 -0000
@@ -20,7 +20,7 @@
 usage="\
 Usage: $0 [options]
 Options:
-	-b, --no-bootcheck
+	-b-, --no-bootcheck
 		Do not perform a bootcheck; check only the tests directory
 		or the single command.
 	-c, --compile-only
@@ -86,8 +86,8 @@
 while [ $# -gt 0 ]; do
 	case "$1" in
 
-	-b|--no-bootcheck)
-		bootcheck="-b" ;;
+	-b-|--no-bootcheck)
+		bootcheck="-b-" ;;
 
 	-c|--compile-only)
 		compile_only="-c" ;;
Index: tools/binary_step
===================================================================
RCS file: /home/mercury1/repository/mercury/tools/binary_step,v
retrieving revision 1.15
diff -u -d -r1.15 binary_step
--- tools/binary_step	18 May 2001 14:23:58 -0000	1.15
+++ tools/binary_step	11 Dec 2001 10:28:29 -0000
@@ -13,7 +13,7 @@
 usage="\
 Usage: $0 [options]
 Options:
-	-b, --no-bootcheck
+	-b-, --no-bootcheck
 		Do not perform a bootcheck; check only the tests directory.
 	-c, --compile-only
 		Check the successful creation of the stage3 .c files,
@@ -63,7 +63,7 @@
 while [ $# -gt 0 ]; do
 	case "$1" in
 
-	-b|--no-bootcheck)
+	-b-|--no-bootcheck)
 		bootcheck="false" ;;
 
 	-c|--compile-only)
Index: tools/bootcheck
===================================================================
RCS file: /home/mercury1/repository/mercury/tools/bootcheck,v
retrieving revision 1.122
diff -u -d -r1.122 bootcheck
--- tools/bootcheck	2 Nov 2001 07:20:55 -0000	1.122
+++ tools/bootcheck	11 Dec 2001 10:33:03 -0000
@@ -53,7 +53,7 @@
 		Copy the profiler directory instead of linking it.
 		This is sometimes necessary for bootstrapping
 		changes.
-	-n, --no-bootcheck
+	-b-, --no-bootcheck
 		Do not run the bootstrap check; execute the test suite and/or
 		the extras only. This option requires a previous bootstrap
 		check to have left a working stage 2 directory.
@@ -153,6 +153,9 @@
 while [ $# -gt 0 ]; do
 	case "$1" in
 
+	-b-|--no-bootcheck)
+		do_bootcheck=false ;;
+
 	-d|--test-dir)
 		testdirs="$testdirs $2"; shift ;;
 	-d*)
@@ -209,13 +212,10 @@
 	-p|--copy-profiler)
 		copy_profiler=true ;;
 
-	-n|--no-bootcheck)
-		do_bootcheck=false ;;
-
 	--no-check-namespace)
 		check_namespace=false ;;
 
-	-t|--no-test-suite)
+	-t-|--no-test-suite)
 		runtests=false ;;
 
 	-2|--keep-stage-2)
Index: tools/linear
===================================================================
RCS file: /home/mercury1/repository/mercury/tools/linear,v
retrieving revision 1.5
diff -u -d -r1.5 linear
--- tools/linear	5 Nov 2001 06:06:20 -0000	1.5
+++ tools/linear	11 Dec 2001 10:29:18 -0000
@@ -17,7 +17,7 @@
 usage="\
 Usage: $0 [options]
 Options:
-	-b, --no-bootcheck
+	-b-, --no-bootcheck
 		Do not perform a bootcheck; check only the tests directory.
 	-c, --compile-only
 		Compile only. Do not compare stage2.ok and stage3.
@@ -62,8 +62,8 @@
 while [ $# -gt 0 ]; do
 	case "$1" in
 
-	-b|--no-bootcheck)
-		bootcheck="-b" ;;
+	-b-|--no-bootcheck)
+		bootcheck="-b-" ;;
 
 	-c|--compile-only)
 		compile_only="-c" ;;
Index: tools/makebatch
===================================================================
RCS file: /home/mercury1/repository/mercury/tools/makebatch,v
retrieving revision 1.18
diff -u -d -r1.18 makebatch
--- tools/makebatch	24 May 2001 03:35:42 -0000	1.18
+++ tools/makebatch	11 Dec 2001 10:31:19 -0000
@@ -53,8 +53,8 @@
 	-s|--stop-at-failure)
 		failed="stop" ;;
 
-	-t|--no-test-suite)
-		runtests="-t" ;;
+	-t-|--no-test-suite)
+		runtests="-t-" ;;
 
 	--compile-times)
 		compile_times="--compile-times" ;;
@@ -176,7 +176,8 @@
 	fi
 
 	echo starting bootcheck of version $visn
-	if tools/bootcheck $gradeopt -r $jfactor $runtests $objects $compile_times $testparams > batch/$batch.out.$visn 2>&1
+	if tools/bootcheck $gradeopt --copy-runtime $jfactor $runtests \
+	   $objects $compile_times $testparams > batch/$batch.out.$visn 2>&1
 	then
 		echo bootcheck of version $visn succeeded
 		if test "$compile_times" = ""
Index: tools/test_mercury
===================================================================
RCS file: /home/mercury1/repository/mercury/tools/test_mercury,v
retrieving revision 1.171
diff -u -d -r1.171 test_mercury
--- tools/test_mercury	14 Nov 2001 17:42:44 -0000	1.171
+++ tools/test_mercury	11 Dec 2001 10:25:13 -0000
@@ -537,8 +537,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 -k -r -p -t $PARALLEL ||
-	$install_anyway || { false; exit 1; }
+tools/bootcheck $target_opts --keep-objs --copy-runtime --copy-profiler \
+	--no-test-suite $PARALLEL || $install_anyway || { false; exit 1; }
 cd .. || { false; exit 1; }
 
 #-----------------------------------------------------------------------------#

-- 
Fergus Henderson <fjh at cs.mu.oz.au>  |  "I have always known that the pursuit
The University of Melbourne         |  of excellence is a lethal habit"
WWW: <http://www.cs.mu.oz.au/~fjh>  |     -- the last words of T. S. Garp.
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------