* automake.in (handle_tests): Work correctly if TESTS is empty;

	print nothing if it is.  From Kevin Ryde.

diff --git a/ChangeLog b/ChangeLog
index f379fd9f5d71fe9c2f3bcbbbc1d69637345c441d..3f4f23fe6955e11cd40ff21d6b8c3d9d9d015290 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-05-11  Tom Tromey  <tromey@cygnus.com>
+
+       * automake.in (handle_tests): Work correctly if TESTS is empty;
+       print nothing if it is.  From Kevin Ryde.
+
 2000-05-08  Tom Tromey  <tromey@cygnus.com>
 
        * automake.texi (Texinfo): Mention vers*.texi.

diff --git a/THANKS b/THANKS
index d431e122e4b8ae3438c48a2badc2d6dea34c0899..df7b2aafc028d50e19a2ae9b912a70faa1d49f5e 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -59,6 +59,7 @@ Juergen A. Erhard     jae@laden.ilk.de
 Karl Berry             kb@cs.umb.edu
 Karl Heuer             kwzh@gnu.org
 Kevin Dalley           kevin@aimnet.com
+Kevin Ryde             user42@zip.com.au
 Kevin Street           street@iname.com
 Klaus Reichl           Klaus.Reichl@alcatel.at
 L. Peter Deutsch       ghost@aladdin.com

diff --git a/automake.in b/automake.in
index dd6102c1858c36b731ac359fdc0aae3684764c01..982a0e0e861a9f537c0b3a86a7aa853f3a07e9cd 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -4088,54 +4088,57 @@ sub handle_tests
        $output_rules .= 'check-TESTS: $(TESTS)
        @failed=0; all=0; xfail=0; xpass=0; \\
        srcdir=$(srcdir); export srcdir; \\
-       for tst in $(TESTS); do \\
-         if test -f ./$$tst; then dir=./; \\
-         elif test -f $$tst; then dir=; \\
-         else dir="$(srcdir)/"; fi; \\
-         if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \\
-           all=`expr $$all + 1`; \\
-           case " $(XFAIL_TESTS) " in \\
-           *" $$tst "*) \\
-             xpass=`expr $$xpass + 1`; \\
-             failed=`expr $$failed + 1`; \\
-             echo "XPASS: $$tst"; \\
-           ;; \\
-           *) \\
-             echo "PASS: $$tst"; \\
-           ;; \\
-           esac; \\
-         elif test $$? -ne 77; then \\
-           all=`expr $$all + 1`; \\
-           case " $(XFAIL_TESTS) " in \\
-           *" $$tst "*) \\
-             xfail=`expr $$xfail + 1`; \\
-             echo "XFAIL: $$tst"; \\
-           ;; \\
-           *) \\
-             failed=`expr $$failed + 1`; \\
-             echo "FAIL: $$tst"; \\
-           ;; \\
-           esac; \\
-         fi; \\
-       done; \\
-       if test "$$failed" -eq 0; then \\
-         if test "$$xfail" -eq 0; then \\
-           banner="All $$all tests passed"; \\
-         else \\
-           banner="All $$all tests behaved as expected ($$xfail expected failures)"; \\
-         fi; \\
-       else \\
-         if test "$$xpass" -eq 0; then \\
-           banner="$$failed of $$all tests failed"; \\
+       list=' . "'\$(TESTS)'; \\" . '
+       if test -n "$$list"; then \\
+         for tst in $$list; do \\
+           if test -f ./$$tst; then dir=./; \\
+           elif test -f $$tst; then dir=; \\
+           else dir="$(srcdir)/"; fi; \\
+           if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \\
+             all=`expr $$all + 1`; \\
+             case " $(XFAIL_TESTS) " in \\
+             *" $$tst "*) \\
+               xpass=`expr $$xpass + 1`; \\
+               failed=`expr $$failed + 1`; \\
+               echo "XPASS: $$tst"; \\
+             ;; \\
+             *) \\
+               echo "PASS: $$tst"; \\
+             ;; \\
+             esac; \\
+           elif test $$? -ne 77; then \\
+             all=`expr $$all + 1`; \\
+             case " $(XFAIL_TESTS) " in \\
+             *" $$tst "*) \\
+               xfail=`expr $$xfail + 1`; \\
+               echo "XFAIL: $$tst"; \\
+             ;; \\
+             *) \\
+               failed=`expr $$failed + 1`; \\
+               echo "FAIL: $$tst"; \\
+             ;; \\
+             esac; \\
+           fi; \\
+         done; \\
+         if test "$$failed" -eq 0; then \\
+           if test "$$xfail" -eq 0; then \\
+             banner="All $$all tests passed"; \\
+           else \\
+             banner="All $$all tests behaved as expected ($$xfail expected failures)"; \\
+           fi; \\
          else \\
-           banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \\
+           if test "$$xpass" -eq 0; then \\
+             banner="$$failed of $$all tests failed"; \\
+           else \\
+             banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \\
+           fi; \\
          fi; \\
-       fi; \\
-       dashes=`echo "$$banner" | sed s/./=/g`; \\
-       echo "$$dashes"; \\
-       echo "$$banner"; \\
-       echo "$$dashes"; \\
-       test "$$failed" -eq 0
+         dashes=`echo "$$banner" | sed s/./=/g`; \\
+         echo "$$dashes"; \\
+         echo "$$banner"; \\
+         echo "$$dashes"; \\
+         test "$$failed" -eq 0; \\
+       fi
 ';
     }
 }