From e125ea9e11c60967a4dbebe028244321ce5de3ea Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Fri, 12 May 2000 00:02:29 +0000 Subject: [PATCH] * automake.in (handle_tests): Work correctly if TESTS is empty; print nothing if it is. From Kevin Ryde. --- ChangeLog | 5 +++ THANKS | 1 + automake.in | 95 +++++++++++++++++++++++++++-------------------------- 3 files changed, 55 insertions(+), 46 deletions(-) diff --git a/ChangeLog b/ChangeLog index f379fd9f..3f4f23fe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2000-05-11 Tom Tromey + + * automake.in (handle_tests): Work correctly if TESTS is empty; + print nothing if it is. From Kevin Ryde. + 2000-05-08 Tom Tromey * automake.texi (Texinfo): Mention vers*.texi. diff --git a/THANKS b/THANKS index d431e122..df7b2aaf 100644 --- 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 dd6102c1..982a0e0e 100755 --- 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 '; } } -- 2.43.5