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 <Ralf.Wildenhues@gmx.de>

diff --git a/ChangeLog b/ChangeLog
index c79631e0e1e6645afa9127b35c6b7298664605bb..7a9208cd8d5935b9931cc497d4b653f28fd01e4e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2009-04-10  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+       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 44e794a4613cf119d2b3889b53b5857312058043..8233295cad0bb7386275c4ae4b9b6089fb0bc0ad 100644 (file)
--- 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 f0917a08fcf51cdd3c18ad1b7bca653b68a842fa..00b80d644cb3fa1a5b4f18212c91c8b7d3684307 100644 (file)
--- 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 9f21e73c6a441812c106149b2f583a3ee5a4ec28..836f2531b353ca788d1af5bf51196ba3d6ba9b6a 100644 (file)
--- 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.