archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-16 17:14:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8162412: Ignore any System property specified as -Djdk.module that matches reserved module system properties

Browse source 
Change the checks for module related properties to look for specific properties, not just jdk.module

Reviewed-by: coleenp, gziemski, ddmitriev
This commit is contained in:
Harold Seigel 2016-08-31 10:27:32 -04:00
parent 31d8fcc4f9
commit 0fd1f32873
2 changed files with 98 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

62
hotspot/test/runtime/modules/ModuleOptionsWarn.java
View file

@ -29,6 +29,7 @@
* @library /test/lib
*/
import java.util.Map;
import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.process.ProcessTools;
@ -37,16 +38,65 @@ public class ModuleOptionsWarn {
public static void main(String[] args) throws Exception {
// Test that a warning is issued for module related properties that get ignored.
// Test that a warning is not issued for extraneous jdk.module properties.
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
"-XX:+PrintWarnings", "-Djdk.module.ignored", "-version");
OutputAnalyzer output = new OutputAnalyzer(pb.start());
output.shouldNotContain("Ignoring system property option");
output.shouldHaveExitValue(0);
// Test that a warning is issued for a reserved jdk.module property.
pb = ProcessTools.createJavaProcessBuilder(
"-XX:+PrintWarnings", "-Djdk.module.addmods", "-version");
output = new OutputAnalyzer(pb.start());
output.shouldContain("Ignoring system property option");
output.shouldHaveExitValue(0);
// Test that a warning is issued for a reserved jdk.module property ending in '.'.
pb = ProcessTools.createJavaProcessBuilder(
"-XX:+PrintWarnings", "-Djdk.module.limitmods.", "-version");
output = new OutputAnalyzer(pb.start());
output.shouldContain("Ignoring system property option");
output.shouldHaveExitValue(0);
// Test that a warning is issued for a reserved jdk.module property ending in '='.
pb = ProcessTools.createJavaProcessBuilder(
"-XX:+PrintWarnings", "-Djdk.module.addexports=", "-version");
output = new OutputAnalyzer(pb.start());
output.shouldContain("Ignoring system property option");
output.shouldHaveExitValue(0);
// Test that a warning is issued for a reserved jdk.module property ending in ".stuff"
pb = ProcessTools.createJavaProcessBuilder(
"-XX:+PrintWarnings", "-Djdk.module.addreads.stuff", "-version");
output = new OutputAnalyzer(pb.start());
output.shouldContain("Ignoring system property option");
output.shouldHaveExitValue(0);
// Test that a warning is issued for a reserved jdk.module property ending in "=stuff"
pb = ProcessTools.createJavaProcessBuilder(
"-XX:+PrintWarnings", "-Djdk.module.path=stuff", "-version");
output = new OutputAnalyzer(pb.start());
output.shouldContain("Ignoring system property option");
output.shouldHaveExitValue(0);
// Test that a warning is issued for a reserved jdk.module property ending in ".="
pb = ProcessTools.createJavaProcessBuilder(
"-XX:+PrintWarnings", "-Djdk.module.upgrade.path.=xx", "-version");
output = new OutputAnalyzer(pb.start());
output.shouldContain("Ignoring system property option");
output.shouldHaveExitValue(0);
// Test that a warning is issued for a reserved jdk.module property ending in ".<num>"
pb = ProcessTools.createJavaProcessBuilder(
"-XX:+PrintWarnings", "-Djdk.module.patch.3=xx", "-version");
output = new OutputAnalyzer(pb.start());
output.shouldContain("Ignoring system property option");
output.shouldHaveExitValue(0);
// Test that a warning can be suppressed for module related properties that get ignored.
pb = ProcessTools.createJavaProcessBuilder(
"-Djdk.module.ignored", "-XX:-PrintWarnings", "-version");
"-Djdk.module.addmods", "-XX:-PrintWarnings", "-version");
output = new OutputAnalyzer(pb.start());
output.shouldNotContain("Ignoring system property option");
output.shouldHaveExitValue(0);
@ -57,5 +107,13 @@ public class ModuleOptionsWarn {
output = new OutputAnalyzer(pb.start());
output.shouldNotContain("Ignoring system property option");
output.shouldHaveExitValue(0);
// Test that a warning is issued for module related properties specified using _JAVA_OPTIONS.
pb = ProcessTools.createJavaProcessBuilder("-XX:+PrintWarnings", "-version");
Map<String, String> env = pb.environment();
env.put("_JAVA_OPTIONS", "-Djdk.module.addreads");
output = new OutputAnalyzer(pb.start());
output.shouldContain("Ignoring system property option");
output.shouldHaveExitValue(0);
}
}