Reviewer needed - fix for regression test tools/javac/generics/inference/6650759/T6650759m.java

[Dr Andrew John Hughes]

On 17:00 Fri 03 Dec     , Pavel Tisnovsky wrote:
> Hi all,
> 
> can anybody please review very simple fix for regression test
> tools/javac/generics/inference/6650759/T6650759m.java. There is a
> forgotten character sequence ("- ") in T6650759m.out file - this file is
> compared with output of the java compiler when the test are being compiled.
> 
> Unified diff between wrong and correct T6650759m.out file:
> 
> -T6650759m.java:43:36: compiler.err.prob.found.req:
> (compiler.misc.incompatible
> +T6650759m.java:43:36: compiler.err.prob.found.req: (-
> compiler.misc.incompatible
> 
> hg export generated against IcedTea6 HEAD is stored as attachment.
> 
> Cheers,
> Pavel

Looks good to me.

> # HG changeset patch
> # User ptisnovs
> # Date 1291390897 -3600
> # Node ID 6d63f2dc5ed17080b1040fc98023ab9889804e02
> # Parent  d6930de9aba6fa053125dcc5f0261af773fb7ece
> Regression test fix - corrected .out file used for check messages generated by java compiler.
> 
> diff -r d6930de9aba6 -r 6d63f2dc5ed1 ChangeLog
> --- a/ChangeLog	Fri Dec 03 13:27:58 2010 +0000
> +++ b/ChangeLog	Fri Dec 03 16:41:37 2010 +0100
> @@ -1,3 +1,11 @@
> +2010-12-03  Pavel Tisnovsky  <ptisnovs at redhat.com>
> +
> +	* Makefile.am:
> +	(ICEDTEA_PATCHES): Updated.
> +	* patches/jtreg-T6650759m-fix.patch:
> +	Regression test fix - corrected .out file used for
> +	check messages generated by java compiler.
> +
>  2010-12-01  Andrew John Hughes  <ahughes at redhat.com>
>  
>  	* patches/applet_hole.patch:
> diff -r d6930de9aba6 -r 6d63f2dc5ed1 Makefile.am
> --- a/Makefile.am	Fri Dec 03 13:27:58 2010 +0000
> +++ b/Makefile.am	Fri Dec 03 16:41:37 2010 +0100
> @@ -303,7 +303,8 @@
>  	patches/jtreg-DeleteFont.patch \
>  	patches/jtreg-WindowWithWarningTest.patch \
>  	patches/jtreg-T6638712-fix.patch \
> -	patches/openjdk/7002666-eclipse_cdt_oops_crash.patch
> +	patches/openjdk/7002666-eclipse_cdt_oops_crash.patch \
> +	patches/jtreg-T6650759m-fix.patch
>  
>  if WITH_ALT_HSBUILD
>  ICEDTEA_PATCHES += \
> diff -r d6930de9aba6 -r 6d63f2dc5ed1 patches/jtreg-T6650759m-fix.patch
> --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
> +++ b/patches/jtreg-T6650759m-fix.patch	Fri Dec 03 16:41:37 2010 +0100
> @@ -0,0 +1,6 @@
> +--- openjdk-old/langtools/test/tools/javac/generics/inference/6650759/T6650759m.out	2010-12-03 16:08:35.000000000 +0100
> ++++ openjdk/langtools/test/tools/javac/generics/inference/6650759/T6650759m.out	2010-12-03 16:12:08.000000000 +0100
> +@@ -1,2 +1,2 @@
> +-T6650759m.java:43:36: compiler.err.prob.found.req: (compiler.misc.incompatible.types), java.util.List<? super java.lang.Integer>, java.util.List<? super java.lang.String>
> ++T6650759m.java:43:36: compiler.err.prob.found.req: (- compiler.misc.incompatible.types), java.util.List<? super java.lang.Integer>, java.util.List<? super java.lang.String>
> + 1 error


-- 
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: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint = F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8