[Automake-commit] [SCM] GNU Automake branch, next, updated. v1.10b-18-g79f2c3e

[Ralf Wildenhues]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=79f2c3e24840ff300b586159ce4e7fd4a20042b8

The branch, next has been updated
       via  79f2c3e24840ff300b586159ce4e7fd4a20042b8 (commit)
      from  1692795d705d8c9f2dd6119122995bc62fb2ce7c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 79f2c3e24840ff300b586159ce4e7fd4a20042b8
Author: Ralf Wildenhues <address@hidden>
Date:   Fri Apr 10 13:26:16 2009 +0200

    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.
    * tests/parallel-tests2.test: Adjust recheck test.
    * tests/parallel-tests9.test: Adjust recheck-html test.
    * NEWS: Update.
    Suggestion by Akim Demaille.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                      |   10 ++++++++++
 NEWS                           |    3 +++
 lib/Automake/tests/Makefile.in |   18 +++++++-----------
 lib/am/check.am                |   22 ++++++++--------------
 tests/Makefile.in              |   18 +++++++-----------
 tests/parallel-tests2.test     |    4 ++--
 tests/parallel-tests9.test     |   10 +++++-----
 7 files changed, 42 insertions(+), 43 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8f4b36c..c79631e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2009-04-10  Ralf Wildenhues  <address@hidden>
+
+       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.
+       * tests/parallel-tests2.test: Adjust recheck test.
+       * tests/parallel-tests9.test: Adjust recheck-html test.
+       * NEWS: Update.
+       Suggestion by Akim Demaille.
+
 2009-04-08  Ralf Wildenhues  <address@hidden>
            Eric Blake <address@hidden>
 
diff --git a/NEWS b/NEWS
index cf01518..64756fe 100644
--- a/NEWS
+++ b/NEWS
@@ -14,6 +14,9 @@ New in 1.10c:
 
     to the rules.
 
+  - The new `parallel-tests' targets `recheck' and `recheck-html' will not run
+    any tests that have not run yet.
+
 Bugs fixed in 1.10c:
 
 * Long standing bugs:
diff --git a/lib/Automake/tests/Makefile.in b/lib/Automake/tests/Makefile.in
index 3ccb408..44e794a 100644
--- a/lib/Automake/tests/Makefile.in
+++ b/lib/Automake/tests/Makefile.in
@@ -417,17 +417,13 @@ check-html:
 recheck recheck-html:
        @target=`echo $@ | sed 's,^re,,'`;                              \
        list='$(TEST_LOGS)';                                            \
-       if test -f $(TEST_SUITE_LOG); then                              \
-         list=`for f in $$list; do                                     \
-                 test -f $$f || continue;                              \
-                 if read line < $$f; then                              \
-                   case $$line in FAIL*|XPASS*) echo $$f;; esac;       \
-                 else echo $$f; fi;                                    \
-               done | tr '\012\015' '  '`;                             \
-         $(MAKE) $(AM_MAKEFLAGS) $$target TEST_LOGS="$$list";          \
-       else                                                            \
-         $(MAKE) $(AM_MAKEFLAGS) $$target;                             \
-       fi
+       list=`for f in $$list; do                                       \
+               test -f $$f || continue;                                \
+               if read line < $$f; then                                \
+                 case $$line in FAIL*|XPASS*) echo $$f;; esac;         \
+               else echo $$f; fi;                                      \
+             done | tr '\012\015' '  '`;                               \
+       $(MAKE) $(AM_MAKEFLAGS) $$target TEST_LOGS="$$list"
 .pl.log:
        @p='$<'; $(am__check_pre) $(PL_LOG_COMPILE) "$$tst" $(am__check_post)
 
diff --git a/lib/am/check.am b/lib/am/check.am
index 90cb033..f0917a0 100644
--- a/lib/am/check.am
+++ b/lib/am/check.am
@@ -279,23 +279,17 @@ AM_RECURSIVE_TARGETS += check-html
 ## Rechecking failures. ##
 ## -------------------- ##
 
-## Rerun all FAILed or XPASSed tests (as well as all whose logs are out
-## of date or do not exist).
+## Rerun all FAILed or XPASSed tests.
 recheck recheck-html:
        @target=`echo $@ | sed 's,^re,,'`;                              \
        list='$(TEST_LOGS)';                                            \
-## If the test suite has not been run yet, then run it in full
-       if test -f $(TEST_SUITE_LOG); then                              \
-         list=`for f in $$list; do                                     \
-                 test -f $$f || continue;                              \
-                 if read line < $$f; then                              \
-                   case $$line in FAIL*|XPASS*) echo $$f;; esac;       \
-                 else echo $$f; fi;                                    \
-               done | tr '\012\015' '  '`;                             \
-         $(MAKE) $(AM_MAKEFLAGS) $$target TEST_LOGS="$$list";          \
-       else                                                            \
-         $(MAKE) $(AM_MAKEFLAGS) $$target;                             \
-       fi
+       list=`for f in $$list; do                                       \
+               test -f $$f || continue;                                \
+               if read line < $$f; then                                \
+                 case $$line in FAIL*|XPASS*) echo $$f;; esac;         \
+               else echo $$f; fi;                                      \
+             done | tr '\012\015' '  '`;                               \
+       $(MAKE) $(AM_MAKEFLAGS) $$target TEST_LOGS="$$list"
 
 .PHONY: recheck recheck-html
 .MAKE: recheck recheck-html
diff --git a/tests/Makefile.in b/tests/Makefile.in
index e2fdace..9f21e73 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1150,17 +1150,13 @@ check-html:
 recheck recheck-html:
        @target=`echo $@ | sed 's,^re,,'`;                              \
        list='$(TEST_LOGS)';                                            \
-       if test -f $(TEST_SUITE_LOG); then                              \
-         list=`for f in $$list; do                                     \
-                 test -f $$f || continue;                              \
-                 if read line < $$f; then                              \
-                   case $$line in FAIL*|XPASS*) echo $$f;; esac;       \
-                 else echo $$f; fi;                                    \
-               done | tr '\012\015' '  '`;                             \
-         $(MAKE) $(AM_MAKEFLAGS) $$target TEST_LOGS="$$list";          \
-       else                                                            \
-         $(MAKE) $(AM_MAKEFLAGS) $$target;                             \
-       fi
+       list=`for f in $$list; do                                       \
+               test -f $$f || continue;                                \
+               if read line < $$f; then                                \
+                 case $$line in FAIL*|XPASS*) echo $$f;; esac;         \
+               else echo $$f; fi;                                      \
+             done | tr '\012\015' '  '`;                               \
+       $(MAKE) $(AM_MAKEFLAGS) $$target TEST_LOGS="$$list"
 .test.log:
        @p='$<'; $(am__check_pre) $(TEST_LOG_COMPILE) "$$tst" $(am__check_post)
 
diff --git a/tests/parallel-tests2.test b/tests/parallel-tests2.test
index 3331a0c..2a5fc6f 100755
--- a/tests/parallel-tests2.test
+++ b/tests/parallel-tests2.test
@@ -76,13 +76,13 @@ cat stdout
 test -f mylog.html
 
 # check-html and recheck-html should cause check_SCRIPTS to be created,
-# and recheck-html should rerun all tests if check has not been run.
+# and recheck-html should rerun no tests if check has not been run.
 $MAKE clean
 env TESTS=foo.test $MAKE -e check-html
 test -f bla
 $MAKE clean
 env TESTS=foo.test $MAKE -e recheck-html
 test -f bla
-test -f foo.log
+test ! -f foo.log
 test -f mylog.html
 :
diff --git a/tests/parallel-tests9.test b/tests/parallel-tests9.test
index a61df60..6678920 100755
--- a/tests/parallel-tests9.test
+++ b/tests/parallel-tests9.test
@@ -73,12 +73,12 @@ cat stdout
 grep foo.test stdout || Exit 1
 
 # Ensure that recheck builds check_SCRIPTS, and that
-# recheck reruns all tests if check has not been run.
+# recheck reruns nothing if check has not been run.
 $MAKE clean
-$MAKE recheck && Exit 1
+$MAKE recheck
 test -f bla
-test -f foo.log
-test -f bar.log
-test -f baz.log
+test ! -f foo.log
+test ! -f bar.log
+test ! -f baz.log
 test -f mylog.log
 :


hooks/post-receive
--
GNU Automake