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

[Omair Majid]

changeset b1ed8de8d63e in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=b1ed8de8d63e
description:
	2009-03-30  Omair Majid  <omajid at 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.

diffstat:

4 files changed, 37 insertions(+)
ChangeLog                       |    7 +++++++
HACKING                         |    1 +
Makefile.am                     |    1 +
patches/icedtea-jtreg-dnd.patch |   28 ++++++++++++++++++++++++++++

diffs (68 lines):

diff -r 8dd3adfcadf9 -r b1ed8de8d63e ChangeLog
--- 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-27  Mark Wielaard  <mjw at redhat.c
+2009-03-30  Omair Majid  <omajid at 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 at redhat.com>
 
 	* patches/icedtea-systemtap.patch: New patch.
diff -r 8dd3adfcadf9 -r b1ed8de8d63e HACKING
--- a/HACKING	Fri Mar 27 13:10:15 2009 +0100
+++ b/HACKING	Mon Mar 30 12:31:21 2009 -0400
@@ -88,6 +88,7 @@ The following patches are currently appl
 * 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:
 
diff -r 8dd3adfcadf9 -r b1ed8de8d63e Makefile.am
--- 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 @@ ICEDTEA_PATCHES += \
 	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
diff -r 8dd3adfcadf9 -r b1ed8de8d63e patches/icedtea-jtreg-dnd.patch
--- /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);
+