Reviewer needed: fix in Makefile.am

[Dr Andrew John Hughes]

On 09:09 Tue 15 Mar     , Pavel Tisnovsky wrote:
> Hi all,
> 
> can anybody please review fix I made in Makefile.am in IcedTea6 HEAD?
> This fix ensures that check* targets will work in Dash and various
> versions of Bash (the quote character should be escaped by \ in a
> sub-command called via `` in some Bash versions)
> 
> hg diff is stored in an attachment.
> 
> Here is ChangeLog entry:
> 
> 2011-03-15  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
> 
> Cheers
> Pavel

Approved.

> diff -r 0ca79255e13e Makefile.am
> --- a/Makefile.am	Sun Mar 13 01:00:55 2011 +0100
> +++ b/Makefile.am	Tue Mar 15 09:05:45 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


-- 
Andrew :)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

Support Free Java!
Contribute to GNU Classpath and IcedTea
http://www.gnu.org/software/classpath
http://icedtea.classpath.org
PGP Key: F5862A37 (https://keys.indymedia.org/)
Fingerprint = EA30 D855 D50F 90CD F54D  0698 0713 C3ED F586 2A37