archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 23:04:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8293041: --disable-@files option doesn't work and cause an error

Browse source 
Reviewed-by: alanb
This commit is contained in:
Adam Sotona 2022-11-18 14:55:30 +00:00
parent 761a4f4852
commit 13158cb52d
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/java.base/share/native/libjli/java.c
View file

@ -1374,6 +1374,8 @@ ParseArguments(int *pargc, char ***pargv,
JLI_ReportErrorMessage(ARG_WARN, arg); JLI_ReportErrorMessage(ARG_WARN, arg);
} else if (JLI_StrCCmp(arg, "-splash:") == 0) { } else if (JLI_StrCCmp(arg, "-splash:") == 0) {
; /* Ignore machine independent options already handled */ ; /* Ignore machine independent options already handled */
} else if (JLI_StrCmp(arg, "--disable-@files") == 0) {
; /* Ignore --disable-@files option already handled */
} else if (ProcessPlatformOption(arg)) { } else if (ProcessPlatformOption(arg)) {
; /* Processing of platform dependent options */ ; /* Processing of platform dependent options */
} else { } else {

6
test/jdk/tools/launcher/ArgsFileTest.java
View file

@ -23,7 +23,7 @@
/** /**
* @test * @test
* @bug 8027634 8231863 * @bug 8027634 8231863 8293041
* @summary Argument parsing from file * @summary Argument parsing from file
* @modules jdk.compiler * @modules jdk.compiler
* jdk.zipfs * jdk.zipfs
@ -222,6 +222,10 @@ public class ArgsFileTest extends TestHelper {
verifyUserArgs(Arrays.asList("uarg1", "@uarg2", "@@uarg3", verifyUserArgs(Arrays.asList("uarg1", "@uarg2", "@@uarg3",
"-uarg4", "uarg5", "@argKill"), tr, 3); "-uarg4", "uarg5", "@argKill"), tr, 3);
// --disable-@files should never pass to VM
tr = doExec(env, javaCmd, "@argKill", "--disable-@files", "--version");
tr.checkPositive();
argFile1.delete(); argFile1.delete();
argFile2.delete(); argFile2.delete();
argKill.delete(); argKill.delete();