8206117: failed to get JDK properties for JVM w/o JVMCI

Reviewed-by: kvn
2018-06-29 13:43:35 -07:00 · 2018-06-29 13:43:35 -07:00 · 6c7c6c7190
commit 6c7c6c7190
parent 69438af9ec
39 changed files with 39 additions and 39 deletions
--- a/test/hotspot/jtreg/compiler/graalunit/ApiDirectivesTest.java
+++ b/test/hotspot/jtreg/compiler/graalunit/ApiDirectivesTest.java
@ -24,7 +24,7 @@
 /*
 * @test
 * @summary
- * @requires vm.opt.final.EnableJVMCI
+ * @requires vm.opt.final.EnableJVMCI == true
 *
 * @modules jdk.internal.vm.compiler
 *
--- a/test/hotspot/jtreg/compiler/graalunit/ApiTest.java
+++ b/test/hotspot/jtreg/compiler/graalunit/ApiTest.java
@ -24,7 +24,7 @@
 /*
 * @test
 * @summary
- * @requires vm.opt.final.EnableJVMCI
+ * @requires vm.opt.final.EnableJVMCI == true
 *
 * @modules jdk.internal.vm.compiler
 *
--- a/test/hotspot/jtreg/compiler/graalunit/AsmAarch64Test.java
+++ b/test/hotspot/jtreg/compiler/graalunit/AsmAarch64Test.java
@ -24,7 +24,7 @@
 /*
 * @test
 * @summary
- * @requires vm.opt.final.EnableJVMCI
+ * @requires vm.opt.final.EnableJVMCI == true
 *
 * @modules jdk.internal.vm.compiler
 *
--- a/test/hotspot/jtreg/compiler/graalunit/AsmAmd64Test.java
+++ b/test/hotspot/jtreg/compiler/graalunit/AsmAmd64Test.java
@ -24,7 +24,7 @@
 /*
 * @test
 * @summary
- * @requires vm.opt.final.EnableJVMCI
+ * @requires vm.opt.final.EnableJVMCI == true
 *
 * @modules jdk.internal.vm.compiler
 *
--- a/test/hotspot/jtreg/compiler/graalunit/AsmSparcTest.java
+++ b/test/hotspot/jtreg/compiler/graalunit/AsmSparcTest.java
@ -24,7 +24,7 @@
 /*
 * @test
 * @summary
- * @requires vm.opt.final.EnableJVMCI
+ * @requires vm.opt.final.EnableJVMCI == true
 *
 * @modules jdk.internal.vm.compiler
 *
--- a/test/hotspot/jtreg/compiler/graalunit/CollectionsTest.java
+++ b/test/hotspot/jtreg/compiler/graalunit/CollectionsTest.java
@ -24,7 +24,7 @@
 /*
 * @test
 * @summary
- * @requires vm.opt.final.EnableJVMCI
+ * @requires vm.opt.final.EnableJVMCI == true
 *
 * @modules jdk.internal.vm.compiler
 *
--- a/test/hotspot/jtreg/compiler/graalunit/CoreAmd64Test.java
+++ b/test/hotspot/jtreg/compiler/graalunit/CoreAmd64Test.java
@ -24,7 +24,7 @@
 /*
 * @test
 * @summary
- * @requires vm.opt.final.EnableJVMCI
+ * @requires vm.opt.final.EnableJVMCI == true
 *
 * @modules jdk.internal.vm.compiler
 *
--- a/test/hotspot/jtreg/compiler/graalunit/CoreSparcTest.java
+++ b/test/hotspot/jtreg/compiler/graalunit/CoreSparcTest.java
@ -24,7 +24,7 @@
 /*
 * @test
 * @summary
- * @requires vm.opt.final.EnableJVMCI
+ * @requires vm.opt.final.EnableJVMCI == true
 * @requires vm.simpleArch == "sparcv9"
 * @modules jdk.internal.vm.compiler
 *
--- a/test/hotspot/jtreg/compiler/graalunit/CoreTest.java
+++ b/test/hotspot/jtreg/compiler/graalunit/CoreTest.java
@ -24,7 +24,7 @@
 /*
 * @test
 * @summary
- * @requires vm.opt.final.EnableJVMCI
+ * @requires vm.opt.final.EnableJVMCI == true
 *
 * @modules jdk.internal.vm.compiler
 *
--- a/test/hotspot/jtreg/compiler/graalunit/DebugTest.java
+++ b/test/hotspot/jtreg/compiler/graalunit/DebugTest.java
@ -24,7 +24,7 @@
 /*
 * @test
 * @summary
- * @requires vm.opt.final.EnableJVMCI
+ * @requires vm.opt.final.EnableJVMCI == true
 *
 * @modules jdk.internal.vm.compiler
 *
--- a/test/hotspot/jtreg/compiler/graalunit/GraphTest.java
+++ b/test/hotspot/jtreg/compiler/graalunit/GraphTest.java
@ -24,7 +24,7 @@
 /*
 * @test
 * @summary
- * @requires vm.opt.final.EnableJVMCI
+ * @requires vm.opt.final.EnableJVMCI == true
 * @requires vm.graal.enabled
 * @modules jdk.internal.vm.compiler
 *
--- a/test/hotspot/jtreg/compiler/graalunit/HotspotAmd64Test.java
+++ b/test/hotspot/jtreg/compiler/graalunit/HotspotAmd64Test.java
@ -24,7 +24,7 @@
 /*
 * @test
 * @summary
- * @requires vm.opt.final.EnableJVMCI
+ * @requires vm.opt.final.EnableJVMCI == true
 *
 * @modules jdk.internal.vm.compiler
 *
--- a/test/hotspot/jtreg/compiler/graalunit/HotspotLirTest.java
+++ b/test/hotspot/jtreg/compiler/graalunit/HotspotLirTest.java
@ -24,7 +24,7 @@
 /*
 * @test
 * @summary
- * @requires vm.opt.final.EnableJVMCI
+ * @requires vm.opt.final.EnableJVMCI == true
 *
 * @modules jdk.internal.vm.compiler
 *
--- a/test/hotspot/jtreg/compiler/graalunit/HotspotTest.java
+++ b/test/hotspot/jtreg/compiler/graalunit/HotspotTest.java
@ -24,7 +24,7 @@
 /*
 * @test
 * @summary
- * @requires vm.opt.final.EnableJVMCI
+ * @requires vm.opt.final.EnableJVMCI == true
 *
 * @modules jdk.internal.vm.compiler
 *
--- a/test/hotspot/jtreg/compiler/graalunit/Jtt.MicroTest.java
+++ b/test/hotspot/jtreg/compiler/graalunit/Jtt.MicroTest.java
@ -24,7 +24,7 @@
 /*
 * @test
 * @summary
- * @requires vm.opt.final.EnableJVMCI
+ * @requires vm.opt.final.EnableJVMCI == true
 *
 * @modules jdk.internal.vm.compiler
 *
--- a/test/hotspot/jtreg/compiler/graalunit/JttBackendTest.java
+++ b/test/hotspot/jtreg/compiler/graalunit/JttBackendTest.java
@ -24,7 +24,7 @@
 /*
 * @test
 * @summary
- * @requires vm.opt.final.EnableJVMCI
+ * @requires vm.opt.final.EnableJVMCI == true
 *
 * @modules jdk.internal.vm.compiler
 *
--- a/test/hotspot/jtreg/compiler/graalunit/JttBytecodeTest.java
+++ b/test/hotspot/jtreg/compiler/graalunit/JttBytecodeTest.java
@ -24,7 +24,7 @@
 /*
 * @test
 * @summary
- * @requires vm.opt.final.EnableJVMCI
+ * @requires vm.opt.final.EnableJVMCI == true
 *
 * @modules jdk.internal.vm.compiler
 *
--- a/test/hotspot/jtreg/compiler/graalunit/JttExceptTest.java
+++ b/test/hotspot/jtreg/compiler/graalunit/JttExceptTest.java
@ -24,7 +24,7 @@
 /*
 * @test
 * @summary
- * @requires vm.opt.final.EnableJVMCI
+ * @requires vm.opt.final.EnableJVMCI == true
 *
 * @modules jdk.internal.vm.compiler
 *
--- a/test/hotspot/jtreg/compiler/graalunit/JttHotpathTest.java
+++ b/test/hotspot/jtreg/compiler/graalunit/JttHotpathTest.java
@ -24,7 +24,7 @@
 /*
 * @test
 * @summary
- * @requires vm.opt.final.EnableJVMCI
+ * @requires vm.opt.final.EnableJVMCI == true
 *
 * @modules jdk.internal.vm.compiler
 *
--- a/test/hotspot/jtreg/compiler/graalunit/JttHotspotTest.java
+++ b/test/hotspot/jtreg/compiler/graalunit/JttHotspotTest.java
@ -24,7 +24,7 @@
 /*
 * @test
 * @summary
- * @requires vm.opt.final.EnableJVMCI
+ * @requires vm.opt.final.EnableJVMCI == true
 *
 * @modules jdk.internal.vm.compiler
 *
--- a/test/hotspot/jtreg/compiler/graalunit/JttJdkTest.java
+++ b/test/hotspot/jtreg/compiler/graalunit/JttJdkTest.java
@ -24,7 +24,7 @@
 /*
 * @test
 * @summary
- * @requires vm.opt.final.EnableJVMCI
+ * @requires vm.opt.final.EnableJVMCI == true
 *
 * @modules jdk.internal.vm.compiler
 *
--- a/test/hotspot/jtreg/compiler/graalunit/JttLangALTest.java
+++ b/test/hotspot/jtreg/compiler/graalunit/JttLangALTest.java
@ -24,7 +24,7 @@
 /*
 * @test
 * @summary
- * @requires vm.opt.final.EnableJVMCI
+ * @requires vm.opt.final.EnableJVMCI == true
 *
 * @modules jdk.internal.vm.compiler
 *
--- a/test/hotspot/jtreg/compiler/graalunit/JttLangMTest.java
+++ b/test/hotspot/jtreg/compiler/graalunit/JttLangMTest.java
@ -24,7 +24,7 @@
 /*
 * @test
 * @summary
- * @requires vm.opt.final.EnableJVMCI
+ * @requires vm.opt.final.EnableJVMCI == true
 *
 * @modules jdk.internal.vm.compiler
 *
--- a/test/hotspot/jtreg/compiler/graalunit/JttLangNZTest.java
+++ b/test/hotspot/jtreg/compiler/graalunit/JttLangNZTest.java
@ -24,7 +24,7 @@
 /*
 * @test
 * @summary
- * @requires vm.opt.final.EnableJVMCI
+ * @requires vm.opt.final.EnableJVMCI == true
 *
 * @modules jdk.internal.vm.compiler
 *
--- a/test/hotspot/jtreg/compiler/graalunit/JttLoopTest.java
+++ b/test/hotspot/jtreg/compiler/graalunit/JttLoopTest.java
@ -24,7 +24,7 @@
 /*
 * @test
 * @summary
- * @requires vm.opt.final.EnableJVMCI
+ * @requires vm.opt.final.EnableJVMCI == true
 *
 * @modules jdk.internal.vm.compiler
 *
--- a/test/hotspot/jtreg/compiler/graalunit/JttOptimizeTest.java
+++ b/test/hotspot/jtreg/compiler/graalunit/JttOptimizeTest.java
@ -24,7 +24,7 @@
 /*
 * @test
 * @summary
- * @requires vm.opt.final.EnableJVMCI
+ * @requires vm.opt.final.EnableJVMCI == true
 *
 * @modules jdk.internal.vm.compiler
 *
--- a/test/hotspot/jtreg/compiler/graalunit/JttReflectAETest.java
+++ b/test/hotspot/jtreg/compiler/graalunit/JttReflectAETest.java
@ -24,7 +24,7 @@
 /*
 * @test
 * @summary
- * @requires vm.opt.final.EnableJVMCI
+ * @requires vm.opt.final.EnableJVMCI == true
 *
 * @modules jdk.internal.vm.compiler
 *
--- a/test/hotspot/jtreg/compiler/graalunit/JttReflectFTest.java
+++ b/test/hotspot/jtreg/compiler/graalunit/JttReflectFTest.java
@ -24,7 +24,7 @@
 /*
 * @test
 * @summary
- * @requires vm.opt.final.EnableJVMCI
+ * @requires vm.opt.final.EnableJVMCI == true
 *
 * @modules jdk.internal.vm.compiler
 *
--- a/test/hotspot/jtreg/compiler/graalunit/JttReflectGZTest.java
+++ b/test/hotspot/jtreg/compiler/graalunit/JttReflectGZTest.java
@ -24,7 +24,7 @@
 /*
 * @test
 * @summary
- * @requires vm.opt.final.EnableJVMCI
+ * @requires vm.opt.final.EnableJVMCI == true
 *
 * @modules jdk.internal.vm.compiler
 *
--- a/test/hotspot/jtreg/compiler/graalunit/JttThreadsTest.java
+++ b/test/hotspot/jtreg/compiler/graalunit/JttThreadsTest.java
@ -24,7 +24,7 @@
 /*
 * @test
 * @summary
- * @requires vm.opt.final.EnableJVMCI
+ * @requires vm.opt.final.EnableJVMCI == true
 *
 * @modules jdk.internal.vm.compiler
 *
--- a/test/hotspot/jtreg/compiler/graalunit/LirJttTest.java
+++ b/test/hotspot/jtreg/compiler/graalunit/LirJttTest.java
@ -24,7 +24,7 @@
 /*
 * @test
 * @summary
- * @requires vm.opt.final.EnableJVMCI
+ * @requires vm.opt.final.EnableJVMCI == true
 *
 * @modules jdk.internal.vm.compiler
 *
--- a/test/hotspot/jtreg/compiler/graalunit/LoopTest.java
+++ b/test/hotspot/jtreg/compiler/graalunit/LoopTest.java
@ -24,7 +24,7 @@
 /*
 * @test
 * @summary
- * @requires vm.opt.final.EnableJVMCI
+ * @requires vm.opt.final.EnableJVMCI == true
 *
 * @modules jdk.internal.vm.compiler
 *
--- a/test/hotspot/jtreg/compiler/graalunit/NodesTest.java
+++ b/test/hotspot/jtreg/compiler/graalunit/NodesTest.java
@ -24,7 +24,7 @@
 /*
 * @test
 * @summary
- * @requires vm.opt.final.EnableJVMCI
+ * @requires vm.opt.final.EnableJVMCI == true
 * @requires vm.graal.enabled
 * @modules jdk.internal.vm.compiler
 *
--- a/test/hotspot/jtreg/compiler/graalunit/OptionsTest.java
+++ b/test/hotspot/jtreg/compiler/graalunit/OptionsTest.java
@ -24,7 +24,7 @@
 /*
 * @test
 * @summary
- * @requires vm.opt.final.EnableJVMCI
+ * @requires vm.opt.final.EnableJVMCI == true
 *
 * @modules jdk.internal.vm.compiler
 *
--- a/test/hotspot/jtreg/compiler/graalunit/PhasesCommonTest.java
+++ b/test/hotspot/jtreg/compiler/graalunit/PhasesCommonTest.java
@ -24,7 +24,7 @@
 /*
 * @test
 * @summary
- * @requires vm.opt.final.EnableJVMCI
+ * @requires vm.opt.final.EnableJVMCI == true
 *
 * @modules jdk.internal.vm.compiler
 *
--- a/test/hotspot/jtreg/compiler/graalunit/ReplacementsTest.java
+++ b/test/hotspot/jtreg/compiler/graalunit/ReplacementsTest.java
@ -24,7 +24,7 @@
 /*
 * @test
 * @summary
- * @requires vm.opt.final.EnableJVMCI
+ * @requires vm.opt.final.EnableJVMCI == true
 *
 * @modules jdk.internal.vm.compiler
 *
--- a/test/hotspot/jtreg/compiler/graalunit/UtilTest.java
+++ b/test/hotspot/jtreg/compiler/graalunit/UtilTest.java
@ -24,7 +24,7 @@
 /*
 * @test
 * @summary
- * @requires vm.opt.final.EnableJVMCI
+ * @requires vm.opt.final.EnableJVMCI == true
 *
 * @modules jdk.internal.vm.compiler
 *
--- a/test/hotspot/jtreg/compiler/graalunit/generateTests.sh
+++ b/test/hotspot/jtreg/compiler/graalunit/generateTests.sh
@ -54,7 +54,7 @@ do
 /*
 * @test
 * @summary
- * @requires vm.opt.final.EnableJVMCI
+ * @requires vm.opt.final.EnableJVMCI == true
 * $requireInfo
 * @modules jdk.internal.vm.compiler
 *
--- a/test/jtreg-ext/requires/VMProps.java
+++ b/test/jtreg-ext/requires/VMProps.java
@ -251,7 +251,7 @@ public class VMProps implements Callable<Map<String, String>> {
     * @param flagName - flag name
     */
    private void vmOptFinalFlag(Map<String, String> map, String flagName) {
-        String value = WB.getBooleanVMFlag(flagName) ? "true" : "false";
+        String value = String.valueOf(WB.getBooleanVMFlag(flagName));
        map.put("vm.opt.final." + flagName, value);
    }