/hg/icedtea6: Regression test fix - corrected .out file used for...

[ptisnovs at icedtea.classpath.org]

changeset 531713add335 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=531713add335
author: ptisnovs
date: Mon Dec 06 11:53:07 2010 +0100

	Regression test fix - corrected .out file used for check messages
	generated by java compiler.


diffstat:

3 files changed, 16 insertions(+), 1 deletion(-)
ChangeLog                         |    8 ++++++++
Makefile.am                       |    3 ++-
patches/jtreg-T6650759m-fix.patch |    6 ++++++

diffs (38 lines):

diff -r d6930de9aba6 -r 531713add335 ChangeLog
--- a/ChangeLog	Fri Dec 03 13:27:58 2010 +0000
+++ b/ChangeLog	Mon Dec 06 11:53:07 2010 +0100
@@ -1,3 +1,11 @@ 2010-12-01  Andrew John Hughes  <ahughes
+2010-12-06  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 531713add335 Makefile.am
--- a/Makefile.am	Fri Dec 03 13:27:58 2010 +0000
+++ b/Makefile.am	Mon Dec 06 11:53:07 2010 +0100
@@ -303,7 +303,8 @@ ICEDTEA_PATCHES = \
 	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 531713add335 patches/jtreg-T6650759m-fix.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/jtreg-T6650759m-fix.patch	Mon Dec 06 11:53:07 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