Reviewer needed: fix for regression test tools/javac/generics/inference/6638712/T6638712a.java

Dr Andrew John Hughes ahughes at redhat.com
Tue Nov 30 08:44:33 PST 2010 

On 17:00 Tue 30 Nov     , Pavel Tisnovsky wrote:
> Hi all,
> 
> can anyone please review fix for regression test
> tools/javac/generics/inference/6638712/T6638712a.java. Mercurial
> export for IcedTea6 HEAD (1.10pre) is included in this mail as attachment.
> 
> 
> Brief description of the fix:
> 
> This test is based on textual comparison of "raw" compiler error
> messages with pre-generated messages stored in .out files. These
> pre-generated messages were presumably prepared for source files
> which (in previous version) contained some copyright info at the
> beginning. This info (comments) was removed by this push to JDK7:
> 
> changeset:   380:ed31953ca025
> user:        jjg
> date:        Thu Aug 27 11:08:27 2009 -0700
> summary:     6875336: some tests should use /nodynamiccopyright/
> 
> but the corresponding .out files were not updated (javac output also
> contains line and column number where error is detected and the line
> numbers were of course changed by removing licence comments).
> 
> 
> Cheers
> Pavel

Thanks for tracking this one down.

The diff is a bit hard for me to read, but if it fixes the error message test output so the tests
now pass I'm happy for it to be committed to HEAD.

> # HG changeset patch
> # User ptisnovs
> # Date 1291132200 -3600
> # Node ID a6b2ba2d971d16f1003bf23d87443568bc32dccf
> # Parent  d66a310d5c9464173357d284c930b9cc205868fe
> Regression test fix - compilation results are checked against correct
> .out files.
> 
> diff -r d66a310d5c94 -r a6b2ba2d971d ChangeLog
> --- a/ChangeLog	Mon Nov 29 17:15:17 2010 +0100
> +++ b/ChangeLog	Tue Nov 30 16:50:00 2010 +0100
> @@ -1,3 +1,11 @@
> +2010-11-30  Pavel Tisnovsky  <ptisnovs at redhat.com>
> +
> +	* Makefile.am:
> +	(ICEDTEA_PATCHES): Updated.
> +	* patches/jtreg-T6638712-fix.patch:
> +	Regression test fix - compilation results are checked against
> +	correct .out files.
> +
>  2010-11-29  Pavel Tisnovsky  <ptisnovs at redhat.com>
>  
>  	* Makefile.am:
> diff -r d66a310d5c94 -r a6b2ba2d971d Makefile.am
> --- a/Makefile.am	Mon Nov 29 17:15:17 2010 +0100
> +++ b/Makefile.am	Tue Nov 30 16:50:00 2010 +0100
> @@ -301,7 +301,8 @@
>  	patches/openjdk/6876282-bigdecimal_divide.patch \
>  	patches/f14-fonts.patch \
>  	patches/jtreg-DeleteFont.patch \
> -	patches/jtreg-WindowWithWarningTest.patch
> +	patches/jtreg-WindowWithWarningTest.patch \
> +	patches/jtreg-T6638712-fix.patch
>  
>  if WITH_ALT_HSBUILD
>  ICEDTEA_PATCHES += \
> diff -r d66a310d5c94 -r a6b2ba2d971d patches/jtreg-T6638712-fix.patch
> --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
> +++ b/patches/jtreg-T6638712-fix.patch	Tue Nov 30 16:50:00 2010 +0100
> @@ -0,0 +1,30 @@
> +--- openjdk-old/langtools/test/tools/javac/generics/inference/6638712/T6638712a.out	2010-11-30 14:44:29.000000000 +0100
> ++++ openjdk/langtools/test/tools/javac/generics/inference/6638712/T6638712a.out	2010-11-30 15:27:57.000000000 +0100
> +@@ -1,2 +1,2 @@
> +-T6638712a.java:39:41: compiler.err.invalid.inferred.types: T, (- compiler.misc.inferred.do.not.conform.to.params: java.lang.Iterable<? extends java.util.Comparator<? super java.lang.String>>, java.util.List<java.util.Comparator<?>>)
> ++T6638712a.java:16:41: compiler.err.invalid.inferred.types: T, (- compiler.misc.inferred.do.not.conform.to.params: java.lang.Iterable<? extends java.util.Comparator<? super java.lang.String>>, java.util.List<java.util.Comparator<?>>)
> + 1 error
> +--- openjdk-old/langtools/test/tools/javac/generics/inference/6638712/T6638712b.out	2010-11-30 14:44:29.000000000 +0100
> ++++ openjdk/langtools/test/tools/javac/generics/inference/6638712/T6638712b.out	2010-11-30 15:27:58.000000000 +0100
> +@@ -1,2 +1,2 @@
> +-T6638712b.java:37:21: compiler.err.prob.found.req: (- compiler.misc.incompatible.types.1: (- compiler.misc.no.conforming.instance.exists: T, T, java.lang.String)), <T>T, java.lang.String
> ++T6638712b.java:14:21: compiler.err.prob.found.req: (- compiler.misc.incompatible.types.1: (- compiler.misc.no.conforming.instance.exists: T, T, java.lang.String)), <T>T, java.lang.String
> + 1 error
> +--- openjdk-old/langtools/test/tools/javac/generics/inference/6638712/T6638712c.out	2010-11-30 14:44:29.000000000 +0100
> ++++ openjdk/langtools/test/tools/javac/generics/inference/6638712/T6638712c.out	2010-11-30 15:27:59.000000000 +0100
> +@@ -1,2 +1,2 @@
> +-T6638712c.java:39:9: compiler.err.cant.apply.symbol: <T>sort(T[],java.util.Comparator<? super T>), T6638712c, , java.lang.Enum[],java.util.Comparator<java.lang.Enum<?>>, null
> ++T6638712c.java:16:9: compiler.err.cant.apply.symbol: <T>sort(T[],java.util.Comparator<? super T>), T6638712c, , java.lang.Enum[],java.util.Comparator<java.lang.Enum<?>>, null
> + 1 error
> +--- openjdk-old/langtools/test/tools/javac/generics/inference/6638712/T6638712d.out	2010-11-30 14:44:29.000000000 +0100
> ++++ openjdk/langtools/test/tools/javac/generics/inference/6638712/T6638712d.out	2010-11-30 15:28:01.000000000 +0100
> +@@ -1,2 +1,2 @@
> +-T6638712d.java:39:9: compiler.err.cant.apply.symbol: <U>m(U,java.util.List<java.util.List<U>>), T6638712d, , int,java.util.List<java.util.List<java.lang.String>>, null
> ++T6638712d.java:16:9: compiler.err.cant.apply.symbol: <U>m(U,java.util.List<java.util.List<U>>), T6638712d, , int,java.util.List<java.util.List<java.lang.String>>, null
> + 1 error
> +--- openjdk-old/langtools/test/tools/javac/generics/inference/6638712/T6638712e.out	2010-11-30 14:44:29.000000000 +0100
> ++++ openjdk/langtools/test/tools/javac/generics/inference/6638712/T6638712e.out	2010-11-30 15:28:02.000000000 +0100
> +@@ -1,2 +1,2 @@
> +-T6638712e.java:40:27: compiler.err.prob.found.req: (- compiler.misc.incompatible.types.1: (- compiler.misc.no.conforming.instance.exists: X, T6638712e.Foo<X,java.lang.String>, T6638712e.Foo<java.lang.Object,java.lang.String>)), <X>T6638712e.Foo<X,java.lang.String>, T6638712e.Foo<java.lang.Object,java.lang.String>
> ++T6638712e.java:17:27: compiler.err.prob.found.req: (- compiler.misc.incompatible.types.1: (- compiler.misc.no.conforming.instance.exists: X, T6638712e.Foo<X,java.lang.String>, T6638712e.Foo<java.lang.Object,java.lang.String>)), <X>T6638712e.Foo<X,java.lang.String>, T6638712e.Foo<java.lang.Object,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 the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net
PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint = F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8

More information about the distro-pkg-dev mailing list