* tests/atgeneral.m4 (AT_INIT): Forget about `-n'.

Adjust so that `./testsuite -h 1 2' explains only tests 1 & 2.

diff --git a/ChangeLog b/ChangeLog
index bd950f10534b17883b24bd07658dbbf3b996e673..41f998f62d23fe436c776c1fadb970befe381d74 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-12-15  Akim Demaille  <akim@epita.fr>
+
+       * tests/atgeneral.m4 (AT_INIT): Forget about `-n'.
+       Adjust so that `./testsuite -h 1 2' explains only tests 1 & 2.
+
 2000-12-15  Akim Demaille  <akim@epita.fr>
 
        * acgeneral.m4 (_AC_EVAL): New.

diff --git a/lib/autotest/general.m4 b/lib/autotest/general.m4
index 1dc8b644ec15adcd00379afe9e43bcf6d2576575..03ba0157c2606c4b349d1f8038162e82f773fb56 100644 (file)
--- a/lib/autotest/general.m4
+++ b/lib/autotest/general.m4
@@ -114,9 +114,6 @@ test -f atlocal && . ./atlocal
 
 # -e sets to true
 at_stop_on_error=false
-# Shall we save and check stdout and stderr?
-# -n sets to false
-at_check_stds=:
 # Shall we be verbose?
 at_verbose=:
 # Shall we keep the debug scripts?  Must be `:' when testsuite is
@@ -131,14 +128,13 @@ m4_divert([OPTIONS])
 
 while test $[#] -gt 0; do
   case $[1] in
-    --help | -h) at_help=:; break ;;
+    --help | -h) at_help=: ;;
     --version) echo "$[0] ($at_package) $at_version"; exit 0 ;;
 
     -d) at_debug=:;;
     -e) at_stop_on_error=:;;
-    -n) at_check_stds=false;;
     -v) at_verbose=echo;;
-    -x) at_traceon='set -vx'; at_traceoff='set +vx'; at_check_stds=false;;
+    -x) at_traceon='set -vx'; at_traceoff='set +vx';;
 
     [[0-9] | [0-9][0-9] | [0-9][0-9][0-9] | [0-9][0-9][0-9][0-9]])
         at_tests="$at_tests$[1] ";;
@@ -159,11 +155,10 @@ Usage: $[0] [[OPTION]]... [[TESTS]]
 Run all the tests, or the selected TESTS.
 
 Options:
-  -h  Display this help message and the list of tests
+  -h  Display this help message and the description of TESTS
   -e  Abort the full suite and inhibit normal clean up if a test fails
-  -n  Do not redirect stdout and stderr and do not test their contents
   -v  Force more detailed output, default for debugging scripts
-  -x  Have the shell to trace command execution; also implies option -n
+  -x  Have the shell to trace command execution
 
 Tests:
 EOF

diff --git a/tests/atgeneral.m4 b/tests/atgeneral.m4
index 1dc8b644ec15adcd00379afe9e43bcf6d2576575..03ba0157c2606c4b349d1f8038162e82f773fb56 100644 (file)
--- a/tests/atgeneral.m4
+++ b/tests/atgeneral.m4
@@ -114,9 +114,6 @@ test -f atlocal && . ./atlocal
 
 # -e sets to true
 at_stop_on_error=false
-# Shall we save and check stdout and stderr?
-# -n sets to false
-at_check_stds=:
 # Shall we be verbose?
 at_verbose=:
 # Shall we keep the debug scripts?  Must be `:' when testsuite is
@@ -131,14 +128,13 @@ m4_divert([OPTIONS])
 
 while test $[#] -gt 0; do
   case $[1] in
-    --help | -h) at_help=:; break ;;
+    --help | -h) at_help=: ;;
     --version) echo "$[0] ($at_package) $at_version"; exit 0 ;;
 
     -d) at_debug=:;;
     -e) at_stop_on_error=:;;
-    -n) at_check_stds=false;;
     -v) at_verbose=echo;;
-    -x) at_traceon='set -vx'; at_traceoff='set +vx'; at_check_stds=false;;
+    -x) at_traceon='set -vx'; at_traceoff='set +vx';;
 
     [[0-9] | [0-9][0-9] | [0-9][0-9][0-9] | [0-9][0-9][0-9][0-9]])
         at_tests="$at_tests$[1] ";;
@@ -159,11 +155,10 @@ Usage: $[0] [[OPTION]]... [[TESTS]]
 Run all the tests, or the selected TESTS.
 
 Options:
-  -h  Display this help message and the list of tests
+  -h  Display this help message and the description of TESTS
   -e  Abort the full suite and inhibit normal clean up if a test fails
-  -n  Do not redirect stdout and stderr and do not test their contents
   -v  Force more detailed output, default for debugging scripts
-  -x  Have the shell to trace command execution; also implies option -n
+  -x  Have the shell to trace command execution
 
 Tests:
 EOF