/hg/icedtea6: Regression test fix - compilation results are chec...

[ptisnovs at icedtea.classpath.org]

changeset 0481c6a6d7ed in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=0481c6a6d7ed
author: ptisnovs
date: Tue Nov 30 18:16:07 2010 +0100

	Regression test fix - compilation results are checked against
	correct .out files.


diffstat:

3 files changed, 40 insertions(+), 1 deletion(-)
ChangeLog                        |    8 ++++++++
Makefile.am                      |    3 ++-
patches/jtreg-T6638712-fix.patch |   30 ++++++++++++++++++++++++++++++

diffs (62 lines):

diff -r d66a310d5c94 -r 0481c6a6d7ed ChangeLog
--- a/ChangeLog	Mon Nov 29 17:15:17 2010 +0100
+++ b/ChangeLog	Tue Nov 30 18:16:07 2010 +0100
@@ -1,3 +1,11 @@ 2010-11-29  Pavel Tisnovsky  <ptisnovs at r
+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 0481c6a6d7ed Makefile.am
--- a/Makefile.am	Mon Nov 29 17:15:17 2010 +0100
+++ b/Makefile.am	Tue Nov 30 18:16:07 2010 +0100
@@ -301,7 +301,8 @@ ICEDTEA_PATCHES = \
 	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 0481c6a6d7ed patches/jtreg-T6638712-fix.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/jtreg-T6638712-fix.patch	Tue Nov 30 18:16:07 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