changeset in /hg/icedtea6: 2009-03-13 Omair Majid <omajid at redh...

[Omair Majid]

changeset ebdc89c68af2 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=ebdc89c68af2
description:
	2009-03-13  Omair Majid  <omajid at redhat.com>

	    * patches/icedtea-jtreg-6592792.patch: New file. Makes the
	    com/sun/org/apache/xml/internal/ws/server/Test.java test compile.
	    * Makefile.am (ICEDTEA_PATCHES): Apply the patch.
	    * HACKING: Document the patch.

diffstat:

4 files changed, 22 insertions(+)
ChangeLog                           |    7 +++++++
HACKING                             |    1 +
Makefile.am                         |    1 +
patches/icedtea-jtreg-6592792.patch |   13 +++++++++++++

diffs (53 lines):

diff -r d2194a80a7b6 -r ebdc89c68af2 ChangeLog
--- a/ChangeLog	Fri Mar 13 16:30:29 2009 -0400
+++ b/ChangeLog	Fri Mar 13 17:02:59 2009 -0400
@@ -1,3 +1,10 @@ 2009-03-13  Omair Majid  <omajid at redhat.
+2009-03-13  Omair Majid  <omajid at redhat.com>
+
+	* patches/icedtea-jtreg-6592792.patch: New file. Makes the
+	com/sun/org/apache/xml/internal/ws/server/Test.java test compile.
+	* Makefile.am (ICEDTEA_PATCHES): Apply the patch.
+	* HACKING: Document the patch.
+
 2009-03-13  Omair Majid  <omajid at redhat.com>
 
 	* patches/icedtea-xml-encodinginfo.patch: Added a jtreg test for this bug.
diff -r d2194a80a7b6 -r ebdc89c68af2 HACKING
--- a/HACKING	Fri Mar 13 16:30:29 2009 -0400
+++ b/HACKING	Fri Mar 13 17:02:59 2009 -0400
@@ -85,6 +85,7 @@ The following patches are currently appl
 * icedtea-java2d-dasher.patch: Fix interpretation of dash array elements in BasicStroke (S6793344).
 * icedtea-cc-interp-backedge.patch: Remove some duplicated code in DO_BACKEDGE_CHECKS.
 * icedtea-xml-encodinginfo.patch: Fix possible StackOverflowError in EncodingInfo (PR295).
+* icedtea-jtreg-6592792.patch: Fix jtreg test for bug 6592792 so that it compiles.
 
 The following patches are only applied to OpenJDK6 in IcedTea6:
 
diff -r d2194a80a7b6 -r ebdc89c68af2 Makefile.am
--- a/Makefile.am	Fri Mar 13 16:30:29 2009 -0400
+++ b/Makefile.am	Fri Mar 13 17:02:59 2009 -0400
@@ -662,6 +662,7 @@ ICEDTEA_PATCHES += \
 	patches/hotspot/$(HSBUILD)/icedtea-format.patch \
 	patches/icedtea-cc-interp-backedge.patch \
 	patches/icedtea-xml-encodinginfo.patch \
+	patches/icedtea-jtreg-6592792.patch \
 	$(DISTRIBUTION_PATCHES)
 
 stamps/extract.stamp: stamps/download.stamp
diff -r d2194a80a7b6 -r ebdc89c68af2 patches/icedtea-jtreg-6592792.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-jtreg-6592792.patch	Fri Mar 13 17:02:59 2009 -0400
@@ -0,0 +1,13 @@
+--- openjdk/jdk/test/com/sun/org/apache/xml/internal/ws/server.bak/Test6592792.sh	2009-03-13 15:08:37.000000000 -0400
++++ openjdk/jdk/test/com/sun/org/apache/xml/internal/ws/server/Test6592792.sh	2009-03-13 15:57:46.000000000 -0400
+@@ -52,7 +52,9 @@
+ 
+ ${TESTJAVA}${FS}bin${FS}java ${BIT_FLAG} -version
+ 
+-${TESTJAVA}${FS}bin${FS}javac ${BIT_FLAG} -d . -cp ${TESTJAVA}${FS}jre${FS}lib${FS}rt.jar ${TESTSRC}${FS}Test.java
++# the package com.sun.xml.internal.ws.server rt.jar is filtered by the symbol 
++# file; so ignore it
++${TESTJAVA}${FS}bin${FS}javac ${BIT_FLAG} -XDignore.symbol.file=true -d . ${TESTSRC}${FS}Test.java
+ 
+ ${TESTJAVA}${FS}bin${FS}java ${BIT_FLAG} -cp . Test
+