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

8023735: [TESTBUG] runtime/XCheckJniJsig/XCheckJSig.java fails on MacOS X

Browse Source 
Look for libjsig in correct locations and do not fail if it's not found

Reviewed-by: zgu, ccheung
This commit is contained in:
Harold Seigel 2013-12-23 18:44:59 -05:00
parent 06de19d647
commit ac9faf4243
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
hotspot/test/runtime/XCheckJniJsig/XCheckJSig.java
View File

@ -22,7 +22,6 @@
*/
/*
* @ignore 8023735
* @test
* @bug 7051189 8023393
* @summary Need to suppress info message if -Xcheck:jni is used with libjsig.so
@ -30,7 +29,8 @@
* @run main XCheckJSig
*/
import java.util.*;
import java.io.File;
import java.util.Map;
import com.oracle.java.testlibrary.*;
public class XCheckJSig {
@ -47,33 +47,36 @@ public class XCheckJSig {
String libjsig;
String env_var;
if (Platform.isOSX()) {
libjsig = jdk_path + "/jre/lib/server/libjsig.dylib";
env_var = "DYLD_INSERT_LIBRARIES";
libjsig = jdk_path + "/jre/lib/libjsig.dylib"; // jdk location
if (!(new File(libjsig).exists())) {
libjsig = jdk_path + "/lib/libjsig.dylib"; // jre location
}
} else {
libjsig = jdk_path + "/jre/lib/" + os_arch + "/libjsig.so";
env_var = "LD_PRELOAD";
}
String java_program;
if (Platform.isSolaris()) {
// On Solaris, need to call the 64-bit Java directly in order for
// LD_PRELOAD to work because libjsig.so is 64-bit.
java_program = jdk_path + "/jre/bin/" + os_arch + "/java";
} else {
java_program = JDKToolFinder.getJDKTool("java");
libjsig = jdk_path + "/jre/lib/" + os_arch + "/libjsig.so"; // jdk location
if (!(new File(libjsig).exists())) {
libjsig = jdk_path + "/lib/" + os_arch + "/libjsig.so"; // jre location
}
}
// If this test fails, these might be useful to know.
System.out.println("libjsig: " + libjsig);
System.out.println("osArch: " + os_arch);
System.out.println("java_program: " + java_program);
ProcessBuilder pb = new ProcessBuilder(java_program, "-Xcheck:jni", "-version");
// Make sure the libjsig file exists.
if (!(new File(libjsig).exists())) {
System.out.println("File " + libjsig + " not found, skipping");
return;
}
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-Xcheck:jni", "-version");
Map<String, String> env = pb.environment();
env.put(env_var, libjsig);
OutputAnalyzer output = new OutputAnalyzer(pb.start());
output.shouldNotContain("libjsig is activated");
output.shouldHaveExitValue(0);
pb = new ProcessBuilder(java_program, "-Xcheck:jni", "-verbose:jni", "-version");
pb = ProcessTools.createJavaProcessBuilder("-Xcheck:jni", "-verbose:jni", "-version");
env = pb.environment();
env.put(env_var, libjsig);
output = new OutputAnalyzer(pb.start());