Mercurial > hg > release > icedtea6-1.5
changeset 1454:b1ed8de8d63e
2009-03-30 Omair Majid <omajid@redhat.com>
* patches/icedtea-jtreg-dnd.patch: New Patch. Fixes classpath issues in
java/awt/dnd/FileListBetweenJVMsTest.
* Makefile.am: Apply the above.
* HACKING: Document the above.
| author | Omair Majid <omajid@redhat.com> |
|---|---|
| date | Mon, 30 Mar 2009 12:31:21 -0400 |
| parents | 8dd3adfcadf9 |
| children | 4d01a6a212bd |
| files | ChangeLog HACKING Makefile.am patches/icedtea-jtreg-dnd.patch |
| diffstat | 4 files changed, 37 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri Mar 27 13:10:15 2009 +0100 +++ b/ChangeLog Mon Mar 30 12:31:21 2009 -0400 @@ -1,3 +1,10 @@ +2009-03-30 Omair Majid <omajid@redhat.com> + + * patches/icedtea-jtreg-dnd.patch: New Patch. Fixes classpath issues in + java/awt/dnd/FileListBetweenJVMsTest. + * Makefile.am: Apply the above. + * HACKING: Document the above. + 2009-03-27 Mark Wielaard <mjw@redhat.com> * patches/icedtea-systemtap.patch: New patch.
--- a/HACKING Fri Mar 27 13:10:15 2009 +0100 +++ b/HACKING Mon Mar 30 12:31:21 2009 -0400 @@ -88,6 +88,7 @@ * icedtea-jtreg-6592792.patch: Fix jtreg test for bug 6592792 so that it compiles. * icedtea-s390-noinline.patch: Add special flags for javac on s390 to work around a VM problem with bad code generation during inlining. * icedtea-jtreg-hatrun.patch: Fix jhat test by passing the classpath to the new jvm in HatRun.java. +* icedtea-jtreg-dnd.patch: Fix classpath issues in java/awt/dnd/FileListBetweenJVMsTest. The following patches are only applied to OpenJDK6 in IcedTea6:
--- a/Makefile.am Fri Mar 27 13:10:15 2009 +0100 +++ b/Makefile.am Mon Mar 30 12:31:21 2009 -0400 @@ -687,6 +687,7 @@ patches/icedtea-jtreg-6592792.patch \ patches/icedtea-s390-noinline.patch \ patches/icedtea-jtreg-hatrun.patch \ + patches/icedtea-jtreg-dnd.patch \ $(DISTRIBUTION_PATCHES) stamps/extract.stamp: stamps/download.stamp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/icedtea-jtreg-dnd.patch Mon Mar 30 12:31:21 2009 -0400 @@ -0,0 +1,28 @@ +--- openjdk/jdk/test/java/awt/regtesthelpers/process/ProcessCommunicator.java.orig 2009-03-30 11:41:32.000000000 -0400 ++++ openjdk/jdk/test/java/awt/regtesthelpers/process/ProcessCommunicator.java 2009-03-30 11:44:21.000000000 -0400 +@@ -146,7 +146,11 @@ + final String classPathArguments, final String [] args) + { + StringBuilder commandBuilder = new StringBuilder(); +- commandBuilder.append(javaPath).append(classPathArguments).append(classToExecute.getName()); ++ commandBuilder.append(javaPath).append(" "); ++ if (classPathArguments.trim().length() > 0) { ++ commandBuilder.append("-cp ").append(classPathArguments).append(" "); ++ } ++ commandBuilder.append(classToExecute.getName()); + for (String argument:args) { + commandBuilder.append(" ").append(argument); + } +--- openjdk/jdk/test/java/awt/dnd/FileListBetweenJVMsTest/FileListBetweenJVMsTest.java.orig 2009-03-30 11:45:16.000000000 -0400 ++++ openjdk/jdk/test/java/awt/dnd/FileListBetweenJVMsTest/FileListBetweenJVMsTest.java 2009-03-30 11:46:51.000000000 -0400 +@@ -69,8 +69,9 @@ + String.valueOf(sourceFrame.getSourceFilesNumber()) + }; + ++ String classpath = System.getProperty("java.class.path"); + ProcessResults processResults = +- ProcessCommunicator.executeChildProcess(this.getClass(), args); ++ ProcessCommunicator.executeChildProcess(this.getClass(), classpath, args); + + verifyTestResults(processResults); +