parallel-tests: New target recheck-html.

* lib/am/check.am [PARALLEL_TESTS] (recheck-html): New phony,
recursive target.  Factor common implementation with
`check-html'.
* doc/automake.texi (Tests): Document recheck-html.
* tests/parallel-tests2.test: Test it.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

diff --git a/ChangeLog b/ChangeLog
index 57ca6d82f6ccef14b2abe63d7b8674bb74b9e1dc..cc711a0b747de9e8b1257177d09e22c6037446c5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2009-03-29  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+           Akim Demaille  <akim@lrde.epita.fr>
+
+       parallel-tests: New target recheck-html.
+       * lib/am/check.am [PARALLEL_TESTS] (recheck-html): New phony,
+       recursive target.  Factor common implementation with
+       `check-html'.
+       * doc/automake.texi (Tests): Document recheck-html.
+       * tests/parallel-tests2.test: Test it.
+
 2009-03-28  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
            Akim Demaille  <akim@lrde.epita.fr>
 

diff --git a/doc/automake.texi b/doc/automake.texi
index 84a8a216e0559007d73ff3061bffffa60cd2582e..6ea02ed1302c1e2fb30723175dcab326017afaf6 100644 (file)
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -8510,10 +8510,13 @@ env RECHECK_LOGS= make -e check
 
 @item
 @trindex recheck
+@trindex recheck-html
 You can ensure that all tests are rerun which have failed or passed
 unexpectedly, by running @code{make recheck} in the test directory.
 This convenience target will set @code{RECHECK_LOGS} appropriately
-before invoking the main test driver.
+before invoking the main test driver.  The @code{recheck-html} target
+does the same as @code{recheck} but again converts the resulting log
+file in HTML format, like the @code{check-html} target.
 @end itemize
 
 In order to guarantee an ordering between tests even with @code{make

diff --git a/lib/Automake/tests/Makefile.in b/lib/Automake/tests/Makefile.in
index 3ff98473c2754b2a934b7249d18d8e37228a2fc9..a93a60a93c0b2c16f02aacdd5e782a4d7d981d74 100644 (file)
--- a/lib/Automake/tests/Makefile.in
+++ b/lib/Automake/tests/Makefile.in
@@ -416,8 +416,9 @@ recheck: recheck-am
 
 # Be sure to run check-TESTS first, and then to convert the result.
 # Beware of concurrent executions.  And expect check-TESTS to fail.
-check-html:
-       @if $(MAKE) $(AM_MAKEFLAGS) check-TESTS; then           \
+check-html recheck-html:
+       @target=`echo $@ | sed 's/-html$$//'`;                  \
+       if $(MAKE) $(AM_MAKEFLAGS) $$target-TESTS; then         \
          rv=0; else rv=$$?;                                    \
        fi;                                                     \
        $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_HTML) || exit 4;   \
@@ -551,7 +552,8 @@ ps-am:
 
 uninstall-am:
 
-.MAKE: check-am check-html install-am install-strip recheck-am
+.MAKE: check-am check-html install-am install-strip recheck-am \
+       recheck-html
 
 .PHONY: all all-am check check-TESTS check-am check-html clean \
        clean-generic distclean distclean-generic distdir dvi dvi-am \
@@ -562,8 +564,8 @@ uninstall-am:
        install-ps install-ps-am install-strip installcheck \
        installcheck-am installdirs maintainer-clean \
        maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-       pdf-am ps ps-am recheck recheck-TESTS recheck-am uninstall \
-       uninstall-am
+       pdf-am ps ps-am recheck recheck-TESTS recheck-am recheck-html \
+       uninstall uninstall-am
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.

diff --git a/lib/am/check.am b/lib/am/check.am
index d7ea96e17b48dcd45d4a12e5cc68f86612860d7d..a83f149afba984f68eaa86134d59bd51a8b93123 100644 (file)
--- a/lib/am/check.am
+++ b/lib/am/check.am
@@ -275,14 +275,15 @@ recheck: recheck-am
 
 # Be sure to run check-TESTS first, and then to convert the result.
 # Beware of concurrent executions.  And expect check-TESTS to fail.
-check-html:
-       @if $(MAKE) $(AM_MAKEFLAGS) check-TESTS; then           \
+check-html recheck-html:
+       @target=`echo $@ | sed 's/-html$$//'`;                  \
+       if $(MAKE) $(AM_MAKEFLAGS) $$target-TESTS; then         \
          rv=0; else rv=$$?;                                    \
        fi;                                                     \
        $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_HTML) || exit 4;   \
        exit $$rv
-.PHONY: check-html
-.MAKE: check-html
+.PHONY: check-html recheck-html
+.MAKE: check-html recheck-html
 
 else !%?PARALLEL_TESTS%
 

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 6c481cabeafdf524627f680cfda514f88b61cb2b..48e828c757b4801e118e1eedbbf55110cfa7a0c7 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1129,8 +1129,9 @@ recheck: recheck-am
 
 # Be sure to run check-TESTS first, and then to convert the result.
 # Beware of concurrent executions.  And expect check-TESTS to fail.
-check-html:
-       @if $(MAKE) $(AM_MAKEFLAGS) check-TESTS; then           \
+check-html recheck-html:
+       @target=`echo $@ | sed 's/-html$$//'`;                  \
+       if $(MAKE) $(AM_MAKEFLAGS) $$target-TESTS; then         \
          rv=0; else rv=$$?;                                    \
        fi;                                                     \
        $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_HTML) || exit 4;   \
@@ -1266,7 +1267,8 @@ ps-am:
 
 uninstall-am:
 
-.MAKE: check-am check-html install-am install-strip recheck-am
+.MAKE: check-am check-html install-am install-strip recheck-am \
+       recheck-html
 
 .PHONY: all all-am check check-TESTS check-am check-html clean \
        clean-generic clean-local distclean distclean-generic distdir \
@@ -1277,8 +1279,8 @@ uninstall-am:
        install-pdf-am install-ps install-ps-am install-strip \
        installcheck installcheck-am installdirs maintainer-clean \
        maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-       pdf-am ps ps-am recheck recheck-TESTS recheck-am uninstall \
-       uninstall-am
+       pdf-am ps ps-am recheck recheck-TESTS recheck-am recheck-html \
+       uninstall uninstall-am
 
 
 $(srcdir)/parallel-tests.am: gen-parallel-tests Makefile.am

diff --git a/tests/parallel-tests2.test b/tests/parallel-tests2.test
index 61b05e8ec7ec0356c89acdf0c9d907495b0d4e97..f9e2a3c337d6c6354d5eb4bc66cb82a524d0bd51 100755 (executable)
--- a/tests/parallel-tests2.test
+++ b/tests/parallel-tests2.test
@@ -16,6 +16,7 @@
 
 # Check parallel-tests features:
 # - check-html
+# - recheck-html
 
 required=rst2html
 . ./defs-p || Exit 1
@@ -63,4 +64,9 @@ env TESTS=foo.test $MAKE -e check-html >stdout || { cat stdout; Exit 1; }
 cat stdout
 test -f mylog.html
 
+# Create HTML output also with recheck-html
+rm -f mylog.html
+env TESTS=foo.test $MAKE -e recheck-html >stdout || { cat stdout; Exit 1; }
+cat stdout
+test -f mylog.html
 :