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

8173712: Rename JAVA_OPTIONS environment variable to JDK_JAVA_OPTIONS

Browse Source 
Reviewed-by: henryjen, psandoz
This commit is contained in:
Mandy Chung 2017-02-07 16:41:26 -08:00
parent f87f7e44b7
commit 0c24be389f
7 changed files with 17 additions and 25 deletions
jdk
src/java.base
share/native
launcher
main.c
libjli
args.cjava.h
windows/native/libjli
cmdtoargs.c
test
ProblemList.txt
tools/launcher
ArgsEnvVar.javaI18NArgTest.java

6
jdk/src/java.base/share/native/launcher/main.c

@ -130,10 +130,10 @@ main(int argc, char **argv)
// Add first arg, which is the app name // Add first arg, which is the app name
JLI_List_add(args, JLI_StringDup(argv[0])); JLI_List_add(args, JLI_StringDup(argv[0]));
// Append JAVA_OPTIONS // Append JDK_JAVA_OPTIONS
if (JLI_AddArgsFromEnvVar(args, JAVA_OPTIONS)) { if (JLI_AddArgsFromEnvVar(args, JDK_JAVA_OPTIONS)) {
// JLI_SetTraceLauncher is not called yet // JLI_SetTraceLauncher is not called yet
// Show _JAVA_OPTIONS content along with JAVA_OPTIONS to aid diagnosis // Show _JAVA_OPTIONS content along with JDK_JAVA_OPTIONS to aid diagnosis
if (getenv(JLDEBUG_ENV_ENTRY)) { if (getenv(JLDEBUG_ENV_ENTRY)) {
char *tmp = getenv("_JAVA_OPTIONS"); char *tmp = getenv("_JAVA_OPTIONS");
if (NULL != tmp) { if (NULL != tmp) {

7
jdk/src/java.base/share/native/libjli/args.c

@ -34,7 +34,7 @@
#define NO_JNI #define NO_JNI
#endif #endif
#define JLI_ReportMessage(...) printf(__VA_ARGS__) #define JLI_ReportMessage(...) printf(__VA_ARGS__)
#define JAVA_OPTIONS "JAVA_OPTIONS" #define JDK_JAVA_OPTIONS "JDK_JAVA_OPTIONS"
int IsWhiteSpaceOption(const char* name) { return 1; } int IsWhiteSpaceOption(const char* name) { return 1; }
#else #else
#include "java.h" #include "java.h"
@ -429,10 +429,6 @@ int isTerminalOpt(char *arg) {
} }
jboolean JLI_AddArgsFromEnvVar(JLI_List args, const char *var_name) { jboolean JLI_AddArgsFromEnvVar(JLI_List args, const char *var_name) {
#ifndef ENABLE_JAVA_OPTIONS
return JNI_FALSE;
#else
char *env = getenv(var_name); char *env = getenv(var_name);
char *p, *arg; char *p, *arg;
char quote; char quote;
@ -519,7 +515,6 @@ jboolean JLI_AddArgsFromEnvVar(JLI_List args, const char *var_name) {
} }
return JNI_TRUE; return JNI_TRUE;
#endif
} }
#ifdef DEBUG_ARGFILE #ifdef DEBUG_ARGFILE

2
jdk/src/java.base/share/native/libjli/java.h

@ -71,7 +71,7 @@
#define SPLASH_FILE_ENV_ENTRY "_JAVA_SPLASH_FILE" #define SPLASH_FILE_ENV_ENTRY "_JAVA_SPLASH_FILE"
#define SPLASH_JAR_ENV_ENTRY "_JAVA_SPLASH_JAR" #define SPLASH_JAR_ENV_ENTRY "_JAVA_SPLASH_JAR"
#define JAVA_OPTIONS "JAVA_OPTIONS" #define JDK_JAVA_OPTIONS "JDK_JAVA_OPTIONS"
/* /*
* Pointers to the needed JNI invocation API, initialized by LoadJavaVM. * Pointers to the needed JNI invocation API, initialized by LoadJavaVM.

4
jdk/src/java.base/windows/native/libjli/cmdtoargs.c

@ -205,9 +205,9 @@ void JLI_CmdToArgs(char* cmdline) {
size_t i, cnt; size_t i, cnt;
JLI_List envArgs = JLI_List_new(1); JLI_List envArgs = JLI_List_new(1);
if (JLI_AddArgsFromEnvVar(envArgs, JAVA_OPTIONS)) { if (JLI_AddArgsFromEnvVar(envArgs, JDK_JAVA_OPTIONS)) {
// JLI_SetTraceLauncher is not called yet // JLI_SetTraceLauncher is not called yet
// Show _JAVA_OPTIONS content along with JAVA_OPTIONS to aid diagnosis // Show _JAVA_OPTIONS content along with JDK_JAVA_OPTIONS to aid diagnosis
if (getenv(JLDEBUG_ENV_ENTRY)) { if (getenv(JLDEBUG_ENV_ENTRY)) {
char *tmp = getenv("_JAVA_OPTIONS"); char *tmp = getenv("_JAVA_OPTIONS");
if (NULL != tmp) { if (NULL != tmp) {

1
jdk/test/ProblemList.txt

@ -251,7 +251,6 @@ sanity/client/SwingSet/src/ButtonDemoScreenshotTest.java 8157338 generic-
tools/pack200/CommandLineTests.java 8059906 generic-all tools/pack200/CommandLineTests.java 8059906 generic-all
tools/launcher/ArgsEnvVar.java 8173712 generic-all
tools/launcher/FXLauncherTest.java 8068049 linux-all,macosx-all tools/launcher/FXLauncherTest.java 8068049 linux-all,macosx-all
tools/jimage/JImageExtractTest.java 8169713 generic-all tools/jimage/JImageExtractTest.java 8169713 generic-all

16
jdk/test/tools/launcher/ArgsEnvVar.java

@ -40,7 +40,7 @@ public class ArgsEnvVar extends TestHelper {
private static File testJar = null; private static File testJar = null;
private static Map<String, String> env = new HashMap<>(); private static Map<String, String> env = new HashMap<>();
private static String JAVA_OPTIONS = "JAVA_OPTIONS"; private static String JDK_JAVA_OPTIONS = "JDK_JAVA_OPTIONS";
static void init() throws IOException { static void init() throws IOException {
if (testJar != null) { if (testJar != null) {
@ -105,7 +105,7 @@ public class ArgsEnvVar extends TestHelper {
File argFile2 = createArgFile("argFile2", List.of("-Darg.file2=TWO")); File argFile2 = createArgFile("argFile2", List.of("-Darg.file2=TWO"));
File argFile3 = createArgFile("argFile3", List.of("-Darg.file3=THREE")); File argFile3 = createArgFile("argFile3", List.of("-Darg.file3=THREE"));
env.put(JAVA_OPTIONS, "@argFile1\n-Xint\r-cp @@escaped\t@argFile2"); env.put(JDK_JAVA_OPTIONS, "@argFile1\n-Xint\r-cp @@escaped\t@argFile2");
TestResult tr = doExec(env, javaCmd, "@argFile3", "-cp", "test.jar", "Foo", "uarg1", "@uarg2"); TestResult tr = doExec(env, javaCmd, "@argFile3", "-cp", "test.jar", "Foo", "uarg1", "@uarg2");
@ -133,13 +133,13 @@ public class ArgsEnvVar extends TestHelper {
} }
private TestResult testInEnv(List<String> options) { private TestResult testInEnv(List<String> options) {
env.put(JAVA_OPTIONS, String.join(" ", options)); env.put(JDK_JAVA_OPTIONS, String.join(" ", options));
return doExec(env, javaCmd, "-jar", "test.jar"); return doExec(env, javaCmd, "-jar", "test.jar");
} }
private TestResult testInEnvAsArgFile(List<String> options) throws IOException { private TestResult testInEnvAsArgFile(List<String> options) throws IOException {
File argFile = createArgFile("argFile", options); File argFile = createArgFile("argFile", options);
env.put(JAVA_OPTIONS, "@argFile"); env.put(JDK_JAVA_OPTIONS, "@argFile");
TestResult tr = doExec(env, javaCmd, "-jar", "test.jar"); TestResult tr = doExec(env, javaCmd, "-jar", "test.jar");
argFile.delete(); argFile.delete();
return tr; return tr;
@ -187,7 +187,7 @@ public class ArgsEnvVar extends TestHelper {
File argFile1 = createArgFile("arg File 1", List.of("-Xint")); File argFile1 = createArgFile("arg File 1", List.of("-Xint"));
File argFile2 = createArgFile("arg File 2", List.of("-Dprop='value with spaces'")); File argFile2 = createArgFile("arg File 2", List.of("-Dprop='value with spaces'"));
File argFile3 = createArgFile("arg File 3", List.of("-Xmx32m")); File argFile3 = createArgFile("arg File 3", List.of("-Xmx32m"));
env.put(JAVA_OPTIONS, "'@arg File 1' @\"arg File 2\" @'arg File'\" 3\""); env.put(JDK_JAVA_OPTIONS, "'@arg File 1' @\"arg File 2\" @'arg File'\" 3\"");
TestResult tr = doExec(env, javaCmd, "-jar", "test.jar"); TestResult tr = doExec(env, javaCmd, "-jar", "test.jar");
List<String> options = new ArrayList<>(); List<String> options = new ArrayList<>();
@ -204,7 +204,7 @@ public class ArgsEnvVar extends TestHelper {
@Test @Test
public void openQuoteShouldFail() { public void openQuoteShouldFail() {
env.put(JAVA_OPTIONS, "-Dprop='value missing close quote"); env.put(JDK_JAVA_OPTIONS, "-Dprop='value missing close quote");
TestResult tr = doExec(env, javaCmd, "-version"); TestResult tr = doExec(env, javaCmd, "-version");
tr.checkNegative(); tr.checkNegative();
if (!tr.testStatus) { if (!tr.testStatus) {
@ -215,11 +215,11 @@ public class ArgsEnvVar extends TestHelper {
@Test @Test
public void noWildcard() { public void noWildcard() {
env.put(JAVA_OPTIONS, "-cp *"); env.put(JDK_JAVA_OPTIONS, "-cp *");
TestResult tr = doExec(env, javaCmd, "-jar", "test.jar"); TestResult tr = doExec(env, javaCmd, "-jar", "test.jar");
verifyOptions(List.of("-cp", "*", "-jar", "test.jar"), tr); verifyOptions(List.of("-cp", "*", "-jar", "test.jar"), tr);
env.put(JAVA_OPTIONS, "-p ?"); env.put(JDK_JAVA_OPTIONS, "-p ?");
tr = doExec(env, javaCmd, "-jar", "test.jar", "one", "two"); tr = doExec(env, javaCmd, "-jar", "test.jar", "one", "two");
verifyOptions(List.of("-p", "?", "-jar", "test.jar", "one", "two"), tr); verifyOptions(List.of("-p", "?", "-jar", "test.jar", "one", "two"), tr);
} }

6
jdk/test/tools/launcher/I18NArgTest.java

@ -95,21 +95,19 @@ public class I18NArgTest extends TestHelper {
throw new RuntimeException("test fails"); throw new RuntimeException("test fails");
} }
// Test via JAVA_OPTIONS // Test via JDK_JAVA_OPTIONS
/*
Map<String, String> env = new HashMap<>(); Map<String, String> env = new HashMap<>();
String cmd = "-Dtest.src=" + TEST_SOURCES_DIR.getAbsolutePath() + String cmd = "-Dtest.src=" + TEST_SOURCES_DIR.getAbsolutePath() +
" -Dtest.classes=" + TEST_CLASSES_DIR.getAbsolutePath() + " -Dtest.classes=" + TEST_CLASSES_DIR.getAbsolutePath() +
" -cp " + TEST_CLASSES_DIR.getAbsolutePath() + " -cp " + TEST_CLASSES_DIR.getAbsolutePath() +
" I18NArgTest " + unicodeStr + " " + hexValue; " I18NArgTest " + unicodeStr + " " + hexValue;
env.put("JAVA_OPTIONS", cmd); env.put("JDK_JAVA_OPTIONS", cmd);
tr = doExec(env, javaCmd); tr = doExec(env, javaCmd);
System.out.println(tr.testOutput); System.out.println(tr.testOutput);
if (!tr.isOK()) { if (!tr.isOK()) {
System.err.println(tr); System.err.println(tr);
throw new RuntimeException("test fails"); throw new RuntimeException("test fails");
} }
*/
} }
static void testCharacters(String... args) { static void testCharacters(String... args) {