# HG changeset patch
# User ykantser
# Date 1422866273 -3600
# Node ID 6c9e357aff5986fa81efcf68dc957531c62fee82
# Parent  ea6b89a1b59bb025aa7c2cf6c8f99b65d01d5e82
8071464: Clear up SVC jdk/test/* JRE layout dependencies other than those on tools.jar
Reviewed-by: sla
Contributed-by: alexander.kulyakhtin@oracle.com

diff -r ea6b89a1b59b -r 6c9e357aff59 jdk/test/com/sun/jdi/ShellScaffold.sh
--- a/jdk/test/com/sun/jdi/ShellScaffold.sh	Fri Jan 30 09:31:18 2015 +0100
+++ b/jdk/test/com/sun/jdi/ShellScaffold.sh	Mon Feb 02 09:37:53 2015 +0100
@@ -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
diff -r ea6b89a1b59b -r 6c9e357aff59 jdk/test/demo/jvmti/DemoRun.java
--- a/jdk/test/demo/jvmti/DemoRun.java	Fri Jan 30 09:31:18 2015 +0100
+++ b/jdk/test/demo/jvmti/DemoRun.java	Mon Feb 02 09:37:53 2015 +0100
@@ -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: