tests: run cmdline_wrap last, or not at all if anything else failed.

* Makefile.am (TESTSUITE_AT): Move stresstest.at and cmdline_wrap.at
to the end of the list.
* tests/cmdline_wrap.at: If previous tests have failed, then we
already know that rerunning them will fail too, so save time by
skipping in that case.

Signed-off-by: Gary V. Vaughan <gary@gnu.org>

diff --git a/Makefile.am b/Makefile.am
index b671328413457c398bf5aea08bf6f28d388fe792..6ccc4d0e837a5a766399da486841ff22e3349b12 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -604,7 +604,9 @@ tests_dir   = $(top_srcdir)/tests
 package_m4     = $(tests_dir)/package.m4
 testsuite      = $(tests_dir)/testsuite
 
-# The testsuite files are evaluated in the order given here.
+# The testsuite files are evaluated in the order given here. When
+# adding new tests, make sure cmdline_wrap.at stays at the end so
+# that it can check for previous failures and skip if necessary.
 TESTSUITE      = tests/testsuite
 TESTSUITE_AT   = tests/testsuite.at \
                  tests/libtoolize.at \
@@ -672,14 +674,15 @@ TESTSUITE_AT      = tests/testsuite.at \
                  tests/no-executables.at \
                  tests/deplibs-ident.at \
                  tests/configure-iface.at \
-                 tests/stresstest.at \
-                 tests/cmdline_wrap.at \
                  tests/f77demo.at \
                  tests/fcdemo.at \
                  tests/darwin.at \
                  tests/dumpbin-symbols.at \
                  tests/deplibs-mingw.at \
-                 tests/sysroot.at
+                 tests/sysroot.at \
+                 tests/stresstest.at \
+                 tests/cmdline_wrap.at \
+                 $(NOTHING_ELSE)
 
 EXTRA_DIST     += $(testsuite) $(TESTSUITE_AT) $(package_m4)
 

diff --git a/tests/cmdline_wrap.at b/tests/cmdline_wrap.at
index 42ce51b1b17ff02513385eb618dfcb39f42cfdeb..f5f5832d180d3f51557f912e78aed34b9fd64d9a 100644 (file)
--- a/tests/cmdline_wrap.at
+++ b/tests/cmdline_wrap.at
@@ -27,6 +27,9 @@
 
 AT_SETUP([Run tests with low max_cmd_len])
 AT_KEYWORDS([recursive expensive])
+dnl If we already have failures, then reruns will fail too!
+fail_list=`for f in ?/fail ??/fail ???/fail ????/fail; do echo $f; end`
+AT_CHECK([test -z "$fail_list" || (exit 77)])
 m4_ifdef([AT_CAPTURE_FILE],
 [AT_CAPTURE_FILE([testsuite.log])])