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

8154212: launcher SEGV when _JAVA_LAUNCHER_DEBUG is set

Browse Source 
Reviewed-by: alanb, martin
This commit is contained in:
Kumar Srinivasan 2016-04-14 14:23:59 -07:00
parent 9449ca7449
commit 96608b3717
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jdk/src/java.base/share/native/libjli/java.h
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -228,7 +228,7 @@ enum LaunchMode { // cf. sun.launcher.LauncherHelper
};
static const char *launchModeNames[]
= { "Unknown", "Main class", "JAR file" };
= { "Unknown", "Main class", "JAR file", "Module" };
typedef struct {
int argc;

19
jdk/test/tools/launcher/MiscTests.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -23,7 +23,7 @@
/*
* @test
* @bug 6856415
* @bug 6856415 8154212
* @summary Miscellaneous tests, Exceptions
* @compile -XDignore.symbol.file MiscTests.java
* @run main MiscTests
@ -33,7 +33,9 @@
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
public class MiscTests extends TestHelper {
@ -103,11 +105,22 @@ public class MiscTests extends TestHelper {
}
}
static void testJLDEnvWithTool() {
final Map<String, String> envMap = new HashMap<>();
envMap.put("_JAVA_LAUNCHER_DEBUG", "true");
TestResult tr = doExec(envMap, javacCmd, "-version");
tr.checkPositive();
if (!tr.isOK()) {
System.out.println(tr);
}
}
public static void main(String... args) throws IOException {
testWithClassPathSetViaProperty();
test6856415();
testJLDEnvWithTool();
if (testExitValue != 0) {
throw new Error(testExitValue + " tests failed");
}
}
}
}