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

8174202: jtreg AOT tests should not assume library extension of .so

Browse Source 
Reviewed-by: kvn
This commit is contained in:
Igor Ignatyev 2017-08-11 16:06:38 -07:00
parent 37bbfcb2fa
commit 970fe42560
2 changed files with 41 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
hotspot/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/Main.java
View File

@ -247,7 +247,7 @@ public class Main implements LogPrinter {
public static class Options {
public List<SearchFor> files = new LinkedList<>();
public String outputName = "unnamed.so";
public String outputName = defaultOutputName();
public String methodList;
public List<ClassSource> sources = new ArrayList<>();
public String linkerpath = null;
@ -269,6 +269,30 @@ public class Main implements LogPrinter {
public boolean version;
public boolean compileWithAssertions;
public boolean tiered;
private static String defaultOutputName() {
String osName = System.getProperty("os.name");
String name = "unnamed.";
String ext;
switch (osName) {
case "Linux":
case "SunOS":
ext = "so";
break;
case "Mac OS X":
ext = "dylib";
break;
default:
if (osName.startsWith("Windows")) {
ext = "dll";
} else {
ext = "so";
}
}
return name + ext;
}
}
/* package */final Options options = new Options();
@ -529,45 +553,41 @@ public class Main implements LogPrinter {
String name = options.outputName;
String objectFileName = name;
// [TODO] The jtregs tests expect .so extension so don't
// override with platform specific file extension until the
// tests are fixed.
String libraryFileName = name;
String linkerCmd;
String linkerPath;
String osName = System.getProperty("os.name");
if (name.endsWith(".so")) {
objectFileName = name.substring(0, name.length() - ".so".length());
} else if (name.endsWith(".dylib")) {
objectFileName = name.substring(0, name.length() - ".dylib".length());
} else if (name.endsWith(".dll")) {
objectFileName = name.substring(0, name.length() - ".dll".length());
}
switch (osName) {
case "Linux":
// libraryFileName = options.outputName + ".so";
objectFileName = objectFileName + ".o";
if (name.endsWith(".so")) {
objectFileName = name.substring(0, name.length() - ".so".length());
}
linkerPath = (options.linkerpath != null) ? options.linkerpath : "ld";
linkerCmd = linkerPath + " -shared -z noexecstack -o " + libraryFileName + " " + objectFileName;
break;
case "SunOS":
// libraryFileName = options.outputName + ".so";
if (name.endsWith(".so")) {
objectFileName = name.substring(0, name.length() - ".so".length());
}
objectFileName = objectFileName + ".o";
linkerPath = (options.linkerpath != null) ? options.linkerpath : "ld";
linkerCmd = linkerPath + " -shared -o " + libraryFileName + " " + objectFileName;
break;
case "Mac OS X":
// libraryFileName = options.outputName + ".dylib";
if (name.endsWith(".dylib")) {
objectFileName = name.substring(0, name.length() - ".dylib".length());
}
objectFileName = objectFileName + ".o";
linkerPath = (options.linkerpath != null) ? options.linkerpath : "ld";
linkerCmd = linkerPath + " -dylib -o " + libraryFileName + " " + objectFileName;
break;
default:
if (osName.startsWith("Windows")) {
// libraryFileName = options.outputName + ".dll";
if (name.endsWith(".dll")) {
objectFileName = name.substring(0, name.length() - ".dll".length());
}
objectFileName = objectFileName + ".obj";
linkerPath = (options.linkerpath != null) ? options.linkerpath : getWindowsLinkPath();
if (linkerPath == null) {
@ -575,8 +595,9 @@ public class Main implements LogPrinter {
}
linkerCmd = linkerPath + " /DLL /OPT:NOREF /NOLOGO /NOENTRY" + " /OUT:" + libraryFileName + " " + objectFileName;
break;
} else
} else {
throw new InternalError("Unsupported platform: " + osName);
}
}
try (Timer t = new Timer(this, "Creating binary: " + objectFileName)) {

3
hotspot/test/compiler/aot/cli/jaotc/JaotcTestHelper.java
View File

@ -26,13 +26,14 @@ package compiler.aot.cli.jaotc;
import java.io.File;
import java.io.IOException;
import jdk.test.lib.process.ExitCode;
import jdk.test.lib.Platform;
import jdk.test.lib.JDKToolLauncher;
import jdk.test.lib.Utils;
import jdk.test.lib.cli.CommandLineOptionTest;
import jdk.test.lib.process.OutputAnalyzer;
public class JaotcTestHelper {
public static final String DEFAULT_LIB_PATH = "./unnamed.so";
public static final String DEFAULT_LIB_PATH = "./unnamed." + Platform.sharedLibraryExt();
public static final String DEFAULT_LIBRARY_LOAD_MESSAGE = "loaded " + DEFAULT_LIB_PATH
+ " aot library";
private static final String ENABLE_AOT = "-XX:+UseAOT";