stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8061448: Cleanup sun/misc/JarIndex tests to remove the check for the jre directory

Browse Source 
Reviewed-by: chegar
This commit is contained in:
Felix Yang 2015-01-20 13:49:28 +00:00
parent a7cd12f10a
commit c06b7a8915
2 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
jdk/test/sun/misc/JarIndex/JarIndexMergeForClassLoaderTest.java
View File

@ -48,14 +48,7 @@ public class JarIndexMergeForClassLoaderTest {
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 {

10
jdk/test/sun/misc/JarIndex/metaInfFilenames/Basic.java
View File

@ -78,7 +78,6 @@ import com.sun.net.httpserver.HttpServer;
* 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 @@ public class Basic {
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 */