Re: RFR: JDK-8071464: Clear up SVC jdk/test/* JRE layout dependencies other than those on tools.jar

[Alexander Kulyakhtin]

Hi Katja, Stafan

I've corrected the alignment issue, per Stafan's review, and attached the patch.

Could it be possible to push the patch? 

Thank you very much for your help.

Best regards,
Alex

----- Original Message -----
From: staffan.lar...@oracle.com
To: alexander.kulyakh...@oracle.com
Cc: serviceability-dev@openjdk.java.net
Sent: Thursday, January 29, 2015 11:02:12 AM GMT +04:00 Abu Dhabi / Muscat
Subject: Re: RFR: JDK-8071464: Clear up SVC jdk/test/* JRE layout dependencies 
other than those on tools.jar

Looks good!

nit: test/com/sun/jdi/ShellScaffold.sh:947, the alignment for ">&2” got broken.

Thanks,
/Staffan


> On 28 jan 2015, at 17:24, Alexander Kulyakhtin 
> <alexander.kulyakh...@oracle.com> wrote:
> 
> Hi,
> 
> Could you, please, review the fix below.
> 
> bug: https://bugs.openjdk.java.net/browse/JDK-8071464
> webrev: http://cr.openjdk.java.net/~eistepan/~akulyakhtin/8071464/webrev.01/
> 
> References to the jre layout are removed from ShellScaffold.sh and 
> DemoRun.java. 
> Other files mentioned in the CR have not been changed as they don't contain 
> any JRE-related artifacts anymore.
> 
> Thanks,
> Alex


--- old/test/com/sun/jdi/ShellScaffold.sh	2015-01-29 15:12:55.563689299 +0300
+++ new/test/com/sun/jdi/ShellScaffold.sh	2015-01-29 15:12:55.427689304 +0300
@@ -259,7 +259,7 @@
                     ;;
             esac
 
-            if [ -r $jdk/bin/dt_shmem.dll -o -r $jdk/jre/bin/dt_shmem.dll ] ; then
+            if [ -r $jdk/bin/dt_shmem.dll ] ; then
                 transport=dt_shmem
                 address=kkkk.$$
             else
@@ -933,18 +933,10 @@
         debuggeeCmd=`$jdk/bin/jps -v | $grep $debuggeeKeyword`
         realDebuggeePid=`echo "$debuggeeCmd" | sed -e 's@ .*@@'`
         if [ ! -z "$realDebuggeePid" ] ; then
-            if [ -r "$jdk/lib/sa-jdi.jar" ] ; then
-                # disableVersionCheck can be removed after 6475822
-                # is fixed.
-                moption="-m -J-Dsun.jvm.hotspot.runtime.VM.disableVersionCheck"
-            else
-                moption=
-            fi
-
             echo "-- debuggee process info ----------------------" >&2
             echo "      $debuggeeCmd"                              >&2
             echo "-- debuggee threads: jstack $moption $realDebuggeePid" >&2
-            $jdk/bin/$jstack $moption $realDebuggeePid             >&2
+            $jdk/bin/$jstack $realDebuggeePid                      >&2
             echo "============================================="   >&2
             echo                                                   >&2
         fi
--- old/test/demo/jvmti/DemoRun.java	2015-01-29 15:12:55.963689283 +0300
+++ new/test/demo/jvmti/DemoRun.java	2015-01-29 15:12:55.831689288 +0300
@@ -115,10 +115,7 @@
      */
     public void runit(String class_name, String vm_options[])
     {
-        String jre_home  = System.getProperty("java.home");
-        String sdk_home  = (jre_home.endsWith("jre") ?
-                            (jre_home + File.separator + "..") :
-                            jre_home );
+        String sdk_home  = System.getProperty("java.home");
         String cdir      = System.getProperty("test.classes", ".");
         String os_arch   = System.getProperty("os.arch");
         String os_name   = System.getProperty("os.name");
@@ -126,7 +123,7 @@
         String libsuffix = os_name.contains("Windows")?".dll":
                                 os_name.contains("OS X")?".dylib":".so";
         boolean hprof    = demo_name.equals("hprof");
-        String java      = jre_home
+        String java      = sdk_home
                              + File.separator + "bin"
                              + File.separator + "java";
         /* Array of strings to be passed in for exec: