Mercurial > hg > icedtea8-forest > jdk
changeset 13581:70a653814e61 jdk8u162-b33
8074373: NMT is not enabled if NMT option is specified after class path specifiers
Reviewed-by: dholmes
| author | dbuck |
|---|---|
| date | Fri, 19 Jan 2018 08:24:09 -0500 |
| parents | 1b3f2bacaf3f |
| children | f1f949ac1354 |
| files | src/share/bin/java.c test/tools/launcher/TestSpecialArgs.java |
| diffstat | 2 files changed, 39 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/bin/java.c Wed Jan 03 00:46:54 2018 -0800 +++ b/src/share/bin/java.c Fri Jan 19 08:24:09 2018 -0500 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1995, 2018, 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 @@ -660,15 +660,24 @@ * arguments are for the application (i.e. the main class name, or * the -jar argument). */ - if ((i > 0 && *arg != '-') - || JLI_StrCmp(arg, "-version") == 0 - || JLI_StrCmp(arg, "-fullversion") == 0 - || JLI_StrCmp(arg, "-help") == 0 - || JLI_StrCmp(arg, "-?") == 0 - || JLI_StrCmp(arg, "-jar") == 0 - || JLI_StrCmp(arg, "-X") == 0 - ) { - return; + if (i > 0) { + char *prev = argv[i - 1]; + // skip non-dash arg preceded by class path specifiers + if (*arg != '-' && + ((JLI_StrCmp(prev, "-cp") == 0 + || JLI_StrCmp(prev, "-classpath") == 0))) { + continue; + } + + if (*arg != '-' + || JLI_StrCmp(arg, "-version") == 0 + || JLI_StrCmp(arg, "-fullversion") == 0 + || JLI_StrCmp(arg, "-help") == 0 + || JLI_StrCmp(arg, "-?") == 0 + || JLI_StrCmp(arg, "-jar") == 0 + || JLI_StrCmp(arg, "-X") == 0) { + return; + } } /* * The following case checks for "-XX:NativeMemoryTracking=value".
--- a/test/tools/launcher/TestSpecialArgs.java Wed Jan 03 00:46:54 2018 -0800 +++ b/test/tools/launcher/TestSpecialArgs.java Fri Jan 19 08:24:09 2018 -0500 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2018, 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 7124089 7131021 8042469 8066185 + * @bug 7124089 7131021 8042469 8066185 8074373 * @summary Checks for Launcher special flags, such as MacOSX specific flags, * and JVM NativeMemoryTracking flags. * @compile -XDignore.symbol.file TestSpecialArgs.java EnvironmentVariables.java @@ -270,6 +270,16 @@ tr = doExec(envMap, javaCmd, "Foo", "-XX:NativeMemoryTracking=summary"); checkTestResult(tr); + // should accept with no warnings + tr = doExec(javaCmd, "-cp", jarFile.getName(), + "-XX:NativeMemoryTracking=summary", "Foo"); + ensureNoWarnings(tr); + + // should accept with no warnings + tr = doExec(javaCmd, "-classpath", jarFile.getName(), + "-XX:NativeMemoryTracking=summary", "Foo"); + ensureNoWarnings(tr); + // make sure a missing class is handled correctly, because the class // resolution is performed by the JVM. tr = doExec(javaCmd, "AbsentClass", "-XX:NativeMemoryTracking=summary"); @@ -278,6 +288,14 @@ } } + void ensureNoWarnings(TestResult tr) { + checkTestResult(tr); + if (tr.contains("warning: Native Memory Tracking")) { + System.err.println(tr.toString()); + throw new RuntimeException("Test Fails"); + } + } + void checkTestResult(TestResult tr) { if (!tr.isOK()) { System.err.println(tr.toString());