/hg/icedtea6: PR637: make check should exit with an error code i...

[ptisnovs at icedtea.classpath.org]

changeset 478d3f5f6a59 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=478d3f5f6a59
author: ptisnovs
date: Tue Mar 08 13:19:47 2011 +0100

	PR637: make check should exit with an error code if any of
	regression test failed.


diffstat:

 ChangeLog   |   7 +++++++
 Makefile.am |  11 +++++++++--
 NEWS        |   7 +++++++
 3 files changed, 23 insertions(+), 2 deletions(-)

diffs (81 lines):

diff -r 97a8f2681254 -r 478d3f5f6a59 ChangeLog
--- a/ChangeLog	Mon Mar 07 15:17:27 2011 -0500
+++ b/ChangeLog	Tue Mar 08 13:19:47 2011 +0100
@@ -1,3 +1,10 @@
+2011-03-08  Pavel Tisnovsky  <ptisnovs at redhat.com>
+
+	* Makefile.am:
+	Added checking of JTreg results - if at least one
+	regression test failed, make exits with error code
+	* NEWS: Updated, added PR637 to a list of bug fixes.
+
 2011-03-07  Omair Majid  <omajid at redhat.com>
 
 	* Makefile.am (ICEDTEA_PATCHES): Apply
diff -r 97a8f2681254 -r 478d3f5f6a59 Makefile.am
--- a/Makefile.am	Mon Mar 07 15:17:27 2011 -0500
+++ b/Makefile.am	Tue Mar 08 13:19:47 2011 +0100
@@ -625,7 +625,8 @@
 	clean-rewriter clean-rewrite-rhino clean-add-systemtap clean-add-systemtap-debug \
 	clean-add-pulseaudio clean-add-pulseaudio-debug clean-add-nss clean-add-nss-debug \
 	clean-add-tzdata-support clean-add-tzdata-support-debug clean-add-systemtap-ecj \
-	clean-add-pulseaudio-ecj clean-add-nss-ecj clean-add-tzdata-support-ecj clean-fonts
+	clean-add-pulseaudio-ecj clean-add-nss-ecj clean-add-tzdata-support-ecj clean-fonts \
+	jtregcheck-summary
 
 env:
 	@echo 'unset JAVA_HOME'
@@ -2072,6 +2073,7 @@
 		$(ICEDTEA_JTREG_OPTIONS) \
 		`pwd`/openjdk/hotspot/test \
 	    | tee test/$@.log
+	test -z `grep "^Error:\|^FAILED:" test/$@.log`
 
 check-langtools: stamps/jtreg.stamp
 	mkdir -p test/langtools/JTwork test/langtools/JTreport
@@ -2082,6 +2084,7 @@
 		$(ICEDTEA_JTREG_OPTIONS) \
 		`pwd`/openjdk/langtools/test \
 	    | tee test/$@.log
+	test -z `grep "^Error:\|^FAILED:" test/$@.log`
 
 check-jdk: stamps/jtreg.stamp
 	mkdir -p test/jdk/JTwork test/jdk/JTreport
@@ -2098,6 +2101,7 @@
 		$(ICEDTEA_JTREG_OPTIONS) \
 		`pwd`/openjdk/jdk/test \
 	    | tee test/$@.log
+	test -z `grep "^Error:\|^FAILED:" test/$@.log`
 
 clean-jtreg-reports:
 	rm -rf test/hotspot test/langtools test/jdk
@@ -2112,8 +2116,11 @@
 
 jtreg_checks = hotspot langtools jdk
 
-jtregcheck: jtreg $(jtreg_checks:%=check-%)
+jtregcheck: jtreg $(jtreg_checks:%=check-%) jtregcheck-summary
+
+jtregcheck-summary:
 	for i in hotspot langtools jdk; do \
+	  touch test/check-$$i.log; \
 	  echo "--------------- jtreg console summary for $$i ---------------"; \
 	  egrep -v '^(Passed:|Directory|Re[a-z]+\ written\ to)' test/check-$$i.log; \
 	done | tee test/jtreg-summary.log
diff -r 97a8f2681254 -r 478d3f5f6a59 NEWS
--- a/NEWS	Mon Mar 07 15:17:27 2011 -0500
+++ b/NEWS	Tue Mar 08 13:19:47 2011 +0100
@@ -11,6 +11,13 @@
 New in release 1.11 (2011-XX-XX):
 
 * Use HotSpot 20 as the default virtual machine.
+* Bug fixes
+  - PR637: make check should exit with an error code if any of regression test
+    failed. Use make check -k if you want to run all three test suites. And it
+    is now also possible to run individual jtreg testsuite (jdk,langtools and
+    hotspot) with the jtreg_checks argument:
+    make check jtreg_checks="langtools hotspot".
+    If none is provided make check runs all testsuites.
 
 New in release 1.10 (2011-XX-XX):