From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Sat, 28 Mar 2009 20:01:43 +0000 (+0100)
Subject: check-html: Always create HTML output, note conversion failure.
X-Git-Tag: v1.10b~4^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=868fb04577daf9c47a4a2bcdd9a92cb78e6cf056;p=thirdparty%2Fautomake.git

check-html: Always create HTML output, note conversion failure.

* lib/am/check.am (check-html): Create `$(TEST_SUITE_HTML)' in
any case.  Exit unsuccessfully if HTML creation failed.
* tests/parallel-tests2.test: Amend test to expose this.

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

diff --git a/ChangeLog b/ChangeLog
index b4c7b4b79..f063cdec2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-03-28  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	check-html: Always create HTML output, note conversion failure.
+	* lib/am/check.am (check-html): Create `$(TEST_SUITE_HTML)' in
+	any case.  Exit unsuccessfully if HTML creation failed.
+	* tests/parallel-tests2.test: Amend test to expose this.
+
 2009-03-24  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
 	parallel-tests: per-extension test driver: <EXT>_LOG_COMPILER.
diff --git a/lib/Automake/tests/Makefile.in b/lib/Automake/tests/Makefile.in
index c732762b3..73e27ffc9 100644
--- a/lib/Automake/tests/Makefile.in
+++ b/lib/Automake/tests/Makefile.in
@@ -411,11 +411,11 @@ check-TESTS:
 # 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 :; else	\
-	  rv=$$?;						\
-	  $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_HTML);		\
-	  exit $$rv;						\
-	fi
+	@if $(MAKE) $(AM_MAKEFLAGS) check-TESTS; then		\
+	  rv=0; else rv=$$?;					\
+	fi;							\
+	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_HTML) || exit 4;	\
+	exit $$rv
 .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 28af2ee16..b8b512ed1 100644
--- a/lib/am/check.am
+++ b/lib/am/check.am
@@ -266,11 +266,11 @@ check-TESTS:
 # 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 :; else	\
-	  rv=$$?;						\
-	  $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_HTML);		\
-	  exit $$rv;						\
-	fi
+	@if $(MAKE) $(AM_MAKEFLAGS) check-TESTS; then		\
+	  rv=0; else rv=$$?;					\
+	fi;							\
+	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_HTML) || exit 4;	\
+	exit $$rv
 .PHONY: check-html
 .MAKE: check-html
 
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 49cb2a2a5..7547a2c8d 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1122,11 +1122,11 @@ check-TESTS:
 # 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 :; else	\
-	  rv=$$?;						\
-	  $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_HTML);		\
-	  exit $$rv;						\
-	fi
+	@if $(MAKE) $(AM_MAKEFLAGS) check-TESTS; then		\
+	  rv=0; else rv=$$?;					\
+	fi;							\
+	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_HTML) || exit 4;	\
+	exit $$rv
 .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 17a510840..61b05e8ec 100755
--- a/tests/parallel-tests2.test
+++ b/tests/parallel-tests2.test
@@ -56,4 +56,11 @@ $AUTOMAKE -a
 $MAKE check-html >stdout && { cat stdout; Exit 1; }
 cat stdout
 test -f mylog.html
+
+# Always create the HTML output, even if there were no failures.
+rm -f mylog.html
+env TESTS=foo.test $MAKE -e check-html >stdout || { cat stdout; Exit 1; }
+cat stdout
+test -f mylog.html
+
 :