infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-04-18 19:00:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

8171468: sun/management/jmxremote/bootstrap/CustomLauncherTest.java fails as lib/$ARCH no longer exists

Browse Source 
Reviewed-by: alanb, redestad
This commit is contained in:
Mandy Chung 2016-12-19 13:50:29 -08:00
parent 8d09a2b2c9
commit 9ca506bd0d
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
jdk/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.java
View File

@ -56,8 +56,6 @@ public class CustomLauncherTest {
private static final String TEST_SRC = System.getProperty("test.src");
private static final String OSNAME = System.getProperty("os.name");
private static final String ARCH;
private static final String LIBARCH;
static {
// magic with os.arch
String osarch = System.getProperty("os.arch");
@ -84,7 +82,6 @@ public class CustomLauncherTest {
ARCH = osarch;
}
}
LIBARCH = ARCH.equals("i586") ? "i386" : ARCH;
}
public static void main(String[] args) throws Exception {
@ -184,15 +181,12 @@ public class CustomLauncherTest {
}
private static Path findLibjvm(FileSystem FS) {
Path libjvmPath = findLibjvm(FS.getPath(TEST_JDK, "jre", "lib", LIBARCH));
if (libjvmPath == null) {
libjvmPath = findLibjvm(FS.getPath(TEST_JDK, "lib", LIBARCH));
}
Path libjvmPath = findLibjvm(FS.getPath(TEST_JDK, "lib"));
return libjvmPath;
}
private static Path findLibjvm(Path libPath) {
// ARCH/libjvm.so -> ARCH/server/libjvm.so -> ARCH/client/libjvm.so
// libjvm.so -> server/libjvm.so -> client/libjvm.so
Path libjvmPath = libPath.resolve("libjvm.so");
if (isFileOk(libjvmPath)) {
return libjvmPath;