# HG changeset patch
# User xiaofeya
# Date 1421761768 0
# Node ID c1aedcf211da4d412faf836b8b8477d131dca404
# Parent  b86e910f3310facbb6e1cf89e65438bdcd2674db
8061448: Cleanup sun/misc/JarIndex tests to remove the check for the jre directory
Reviewed-by: chegar

diff -r b86e910f3310 -r c1aedcf211da jdk/test/sun/misc/JarIndex/JarIndexMergeForClassLoaderTest.java
--- a/jdk/test/sun/misc/JarIndex/JarIndexMergeForClassLoaderTest.java	Mon Jan 19 19:12:11 2015 +0300
+++ b/jdk/test/sun/misc/JarIndex/JarIndexMergeForClassLoaderTest.java	Tue Jan 20 13:49:28 2015 +0000
@@ -48,14 +48,7 @@
     static final File tmpFolder = new File(testClassesDir);
 
     static {
-        String javaHome = System.getProperty("java.home");
-        if (javaHome.endsWith("jre")) {
-            int index = javaHome.lastIndexOf(slash);
-            if (index != -1)
-                javaHome = javaHome.substring(0, index);
-        }
-
-        jar = javaHome + slash + "bin" + slash + "jar";
+        jar = System.getProperty("java.home") + slash + "bin" + slash + "jar";
     }
 
     public static void main(String[] args) throws Exception {
diff -r b86e910f3310 -r c1aedcf211da jdk/test/sun/misc/JarIndex/metaInfFilenames/Basic.java
--- a/jdk/test/sun/misc/JarIndex/metaInfFilenames/Basic.java	Mon Jan 19 19:12:11 2015 +0300
+++ b/jdk/test/sun/misc/JarIndex/metaInfFilenames/Basic.java	Tue Jan 20 13:49:28 2015 +0000
@@ -78,7 +78,6 @@
  * URLClassLoader. Each request to the HTTP server is recorded to ensure
  * only the correct amount of requests are being made.
  *
- * Note: Needs jdk/lib/tools.jar in the classpath to compile and run.
  */
 
 public class Basic {
@@ -160,14 +159,7 @@
 
     static String jar;
     static {
-        String javaHome = System.getProperty("java.home");
-        if (javaHome.endsWith("jre")) {
-            int index = javaHome.lastIndexOf(slash);
-            if (index != -1)
-                javaHome = javaHome.substring(0, index);
-        }
-
-        jar = javaHome + slash+  "bin" + slash + "jar";
+        jar = System.getProperty("java.home") + slash+  "bin" + slash + "jar";
     }
 
     /* create the index */