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

[Omair Majid]

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

	    * patches/icedtea-jtreg-hatrun.patch: Fix path to java.

diffstat:

2 files changed, 14 insertions(+), 3 deletions(-)
ChangeLog                          |    4 ++++
patches/icedtea-jtreg-hatrun.patch |   13 ++++++++++---

diffs (38 lines):

diff -r 3e8846035a79 -r c1d29ccc9bcb ChangeLog
--- a/ChangeLog	Tue Mar 17 17:21:01 2009 -0400
+++ b/ChangeLog	Fri Mar 20 10:43:33 2009 -0400
@@ -1,3 +1,7 @@ 2009-03-17  Omair Majid  <omajid at redhat.
+2009-03-20  Omair Majid  <omajid at redhat.com>
+
+	* patches/icedtea-jtreg-hatrun.patch: Fix path to java.
+
 2009-03-17  Omair Majid  <omajid at redhat.com>
 
 	* test/jtreg/excludelist.jdk.jtx: Add
diff -r 3e8846035a79 -r c1d29ccc9bcb patches/icedtea-jtreg-hatrun.patch
--- a/patches/icedtea-jtreg-hatrun.patch	Tue Mar 17 17:21:01 2009 -0400
+++ b/patches/icedtea-jtreg-hatrun.patch	Fri Mar 20 10:43:33 2009 -0400
@@ -1,5 +1,5 @@
---- openjdk/jdk/test/sun/tools/jhat/HatRun.java.orig	2009-03-16 15:01:45.000000000 -0400
-+++ openjdk/jdk/test/sun/tools/jhat/HatRun.java	2009-03-16 15:05:06.000000000 -0400
+--- openjdk/jdk/test/sun/tools/jhat/HatRun.java.orig	2009-03-20 09:55:39.000000000 -0400
++++ openjdk/jdk/test/sun/tools/jhat/HatRun.java	2009-03-20 09:56:48.000000000 -0400
 @@ -161,6 +161,7 @@
      public void runit(String class_name, String vm_options[])
      {
@@ -8,7 +8,14 @@
          String sdk_home  = (jre_home.endsWith("jre") ?
                              (jre_home + File.separator + "..") :
                              jre_home );
-@@ -176,21 +177,25 @@
+@@ -170,27 +171,31 @@
+                            os_arch.equals("amd64");
+         String isa_dir   = d64?(File.separator+os_arch):"";
+         String java      = jre_home
+-                             + File.separator + "bin" + isa_dir
++                             + File.separator + "bin"
+                              + File.separator + "java";
+         String jhat      = sdk_home + File.separator + "bin"
                             + File.separator + "jhat";
          /* Array of strings to be passed in for exec:
           *   1. java