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

8173711: Disable JAVA_OPTIONS env variable support until JDK-8173712 is resolved

Browse Source 
Reviewed-by: ksrini, henryjen
This commit is contained in:
Mandy Chung 2017-01-31 14:47:57 -08:00
parent 1c03567bb7
commit 10fde779ba
3 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
jdk/src/java.base/share/native/libjli/args.c
View File

@ -429,6 +429,10 @@ int isTerminalOpt(char *arg) {
}
jboolean JLI_AddArgsFromEnvVar(JLI_List args, const char *var_name) {
#ifndef ENABLE_JAVA_OPTIONS
return JNI_FALSE;
#else
char *env = getenv(var_name);
char *p, *arg;
char quote;
@ -515,6 +519,7 @@ jboolean JLI_AddArgsFromEnvVar(JLI_List args, const char *var_name) {
}
return JNI_TRUE;
#endif
}
#ifdef DEBUG_ARGFILE

1
jdk/test/ProblemList.txt
View File

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

2
jdk/test/tools/launcher/I18NArgTest.java
View File

@ -96,6 +96,7 @@ public class I18NArgTest extends TestHelper {
}
// Test via JAVA_OPTIONS
/*
Map<String, String> env = new HashMap<>();
String cmd = "-Dtest.src=" + TEST_SOURCES_DIR.getAbsolutePath() +
" -Dtest.classes=" + TEST_CLASSES_DIR.getAbsolutePath() +
@ -108,6 +109,7 @@ public class I18NArgTest extends TestHelper {
System.err.println(tr);
throw new RuntimeException("test fails");
}
*/
}
static void testCharacters(String... args) {