From babf1633c7d53dc5de61c3456a03590e8a823e83 Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Fri, 10 Apr 2009 13:31:28 +0200 Subject: [PATCH] parallel-tests: let VERBOSE=yes output appear before summary. * lib/am/check.am ($(TEST_SUITE_LOG)): In `VERBOSE=yes' mode, output contents of `$(TEST_SUITE_LOG)' before, rather than after the test suite summary. This ensures that the email address appears near the end of the output; also, the log file already starts with a result summary anyway. Signed-off-by: Ralf Wildenhues --- ChangeLog | 7 +++++++ lib/Automake/tests/Makefile.in | 2 +- lib/am/check.am | 2 +- tests/Makefile.in | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index c79631e..7a9208c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2009-04-10 Ralf Wildenhues + parallel-tests: let VERBOSE=yes output appear before summary. + * lib/am/check.am ($(TEST_SUITE_LOG)): In `VERBOSE=yes' mode, + output contents of `$(TEST_SUITE_LOG)' before, rather than after + the test suite summary. This ensures that the email address + appears near the end of the output; also, the log file already + starts with a result summary anyway. + parallel-tests: `clean recheck' should not rerun all tests. * lib/am/check.am (recheck, recheck-html): Do not rerun all tests if `$(TEST_SUITE_LOG)' does not exist. diff --git a/lib/Automake/tests/Makefile.in b/lib/Automake/tests/Makefile.in index 44e794a..8233295 100644 --- a/lib/Automake/tests/Makefile.in +++ b/lib/Automake/tests/Makefile.in @@ -370,6 +370,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS) msg="$${msg}Please report to $(PACKAGE_BUGREPORT). "; \ fi; \ fi; \ + test x"$$VERBOSE" = x || $$exit || cat $(TEST_SUITE_LOG); \ $(am__tty_colors); \ if $$exit; then \ echo $(ECHO_N) "$$grn$(ECHO_C)"; \ @@ -378,7 +379,6 @@ $(TEST_SUITE_LOG): $(TEST_LOGS) fi; \ echo "$$msg" | $(am__text_box); \ echo $(ECHO_N) "$$std$(ECHO_C)"; \ - test x"$$VERBOSE" = x || $$exit || cat $(TEST_SUITE_LOG); \ $$exit # Run all the tests. diff --git a/lib/am/check.am b/lib/am/check.am index f0917a0..00b80d6 100644 --- a/lib/am/check.am +++ b/lib/am/check.am @@ -208,6 +208,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS) msg="$${msg}Please report to $(PACKAGE_BUGREPORT). "; \ fi; \ fi; \ + test x"$$VERBOSE" = x || $$exit || cat $(TEST_SUITE_LOG); \ $(am__tty_colors); \ if $$exit; then \ echo $(ECHO_N) "$$grn$(ECHO_C)"; \ @@ -216,7 +217,6 @@ $(TEST_SUITE_LOG): $(TEST_LOGS) fi; \ echo "$$msg" | $(am__text_box); \ echo $(ECHO_N) "$$std$(ECHO_C)"; \ - test x"$$VERBOSE" = x || $$exit || cat $(TEST_SUITE_LOG); \ $$exit RECHECK_LOGS = $(TEST_LOGS) diff --git a/tests/Makefile.in b/tests/Makefile.in index 9f21e73..836f253 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -1103,6 +1103,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS) msg="$${msg}Please report to $(PACKAGE_BUGREPORT). "; \ fi; \ fi; \ + test x"$$VERBOSE" = x || $$exit || cat $(TEST_SUITE_LOG); \ $(am__tty_colors); \ if $$exit; then \ echo $(ECHO_N) "$$grn$(ECHO_C)"; \ @@ -1111,7 +1112,6 @@ $(TEST_SUITE_LOG): $(TEST_LOGS) fi; \ echo "$$msg" | $(am__text_box); \ echo $(ECHO_N) "$$std$(ECHO_C)"; \ - test x"$$VERBOSE" = x || $$exit || cat $(TEST_SUITE_LOG); \ $$exit # Run all the tests. -- 2.7.4