/hg/icedtea6: Fixed tests at the end in check-* targets to work ...

[ptisnovs at icedtea.classpath.org]

changeset 95deffc939a4 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=95deffc939a4
author: ptisnovs
date: Wed Mar 16 11:28:07 2011 +0100

	Fixed tests at the end in check-* targets to work correctly in Dash
	and various versions of Bash.


diffstat:

 ChangeLog   |  5 +++++
 Makefile.am |  6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diffs (42 lines):

diff -r 0ca79255e13e -r 95deffc939a4 ChangeLog
--- a/ChangeLog	Sun Mar 13 01:00:55 2011 +0100
+++ b/ChangeLog	Wed Mar 16 11:28:07 2011 +0100
@@ -1,3 +1,8 @@
+2011-03-16  Pavel Tisnovsky  <ptisnovs at redhat.com>
+
+	* Makefile.am: Fixed tests at the end in check-* targets to work
+	correctly in Dash and various versions of Bash.
+
 2011-03-13  Xerxes Ranby  <xerxes at zafena.se>
 	    Robert Loughter  <rob at jamvm.org.uk>
 
diff -r 0ca79255e13e -r 95deffc939a4 Makefile.am
--- a/Makefile.am	Sun Mar 13 01:00:55 2011 +0100
+++ b/Makefile.am	Wed Mar 16 11:28:07 2011 +0100
@@ -2078,7 +2078,7 @@
 		$(ICEDTEA_JTREG_OPTIONS) \
 		`pwd`/openjdk/hotspot/test \
 	    | tee test/$@.log
-	test -z `grep "^Error:\|^FAILED:" test/$@.log`
+	test -z `grep \"^Error:\|^FAILED:\" test/$@.log`
 
 check-langtools: stamps/jtreg.stamp
 	mkdir -p test/langtools/JTwork test/langtools/JTreport
@@ -2089,7 +2089,7 @@
 		$(ICEDTEA_JTREG_OPTIONS) \
 		`pwd`/openjdk/langtools/test \
 	    | tee test/$@.log
-	test -z `grep "^Error:\|^FAILED:" test/$@.log`
+	test -z `grep \"^Error:\|^FAILED:\" test/$@.log`
 
 check-jdk: stamps/jtreg.stamp
 	mkdir -p test/jdk/JTwork test/jdk/JTreport
@@ -2106,7 +2106,7 @@
 		$(ICEDTEA_JTREG_OPTIONS) \
 		`pwd`/openjdk/jdk/test \
 	    | tee test/$@.log
-	test -z `grep "^Error:\|^FAILED:" test/$@.log`
+	test -z `grep \"^Error:\|^FAILED:\" test/$@.log`
 
 clean-jtreg-reports:
 	rm -rf test/hotspot test/langtools test/jdk