Skip to content

Commit 8f2f16b

Browse files
committed
Avoid Java 8 launcher warnings in checked JNI test processes
1 parent ce7f63e commit 8f2f16b

3 files changed

Lines changed: 4 additions & 3 deletions

File tree

affinity/src/test/java/net/openhft/affinity/AffinityInitializationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundE
5858
}
5959

6060
public static void main(String[] args) throws Exception {
61-
String scenario = args[0];
61+
String scenario = System.getProperty("affinity.test.scenario");
6262
ClassLoader loader = AffinityInitializationTest.class.getClassLoader();
6363
if (scenario.equals("absent")) {
6464
assertThrows(ClassNotFoundException.class, () -> Class.forName("com.sun.jna.Native", false, loader));

affinity/src/test/java/net/openhft/affinity/AffinityTestProcess.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,11 @@ void runProbe(Class<?> probe, String scenario, boolean withJna, String... option
3333
List<String> command = new ArrayList<>();
3434
command.add(new File(System.getProperty("java.home"), "bin/java").getAbsolutePath());
3535
command.addAll(Arrays.asList(options));
36+
// Avoid Java 8 launcher argument-conversion warnings before the checked JNI calls.
37+
command.add("-Daffinity.test.scenario=" + scenario);
3638
command.add("-cp");
3739
command.add(classpath);
3840
command.add(probe.getName());
39-
command.add(scenario);
4041
Process process = new ProcessBuilder(command).redirectErrorStream(true).redirectOutput(output.toFile()).start();
4142
boolean finished;
4243
try {

affinity/src/test/java/net/openhft/affinity/NativeAffinityIntegrationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ private void runNativeProbe(String scenario) throws Exception {
5252
}
5353

5454
public static void main(String[] args) {
55-
String scenario = args[0];
55+
String scenario = System.getProperty("affinity.test.scenario");
5656
assertTrue(NativeAffinity.LOADED, "The library built by this checkout must load");
5757
NativeAffinity nativeAffinity = NativeAffinity.INSTANCE;
5858
BitSet original = nativeAffinity.getAffinity();

0 commit comments

Comments
 (0)