changeset 50914:07498f5b6a96

8206117: failed to get JDK properties for JVM w/o JVMCI Reviewed-by: kvn
author iignatyev
date Fri, 29 Jun 2018 13:43:35 -0700
parents 9816d7cc655e
children 78711bd05b5a
files test/hotspot/jtreg/compiler/graalunit/ApiDirectivesTest.java test/hotspot/jtreg/compiler/graalunit/ApiTest.java test/hotspot/jtreg/compiler/graalunit/AsmAarch64Test.java test/hotspot/jtreg/compiler/graalunit/AsmAmd64Test.java test/hotspot/jtreg/compiler/graalunit/AsmSparcTest.java test/hotspot/jtreg/compiler/graalunit/CollectionsTest.java test/hotspot/jtreg/compiler/graalunit/CoreAmd64Test.java test/hotspot/jtreg/compiler/graalunit/CoreSparcTest.java test/hotspot/jtreg/compiler/graalunit/CoreTest.java test/hotspot/jtreg/compiler/graalunit/DebugTest.java test/hotspot/jtreg/compiler/graalunit/GraphTest.java test/hotspot/jtreg/compiler/graalunit/HotspotAmd64Test.java test/hotspot/jtreg/compiler/graalunit/HotspotLirTest.java test/hotspot/jtreg/compiler/graalunit/HotspotTest.java test/hotspot/jtreg/compiler/graalunit/Jtt.MicroTest.java test/hotspot/jtreg/compiler/graalunit/JttBackendTest.java test/hotspot/jtreg/compiler/graalunit/JttBytecodeTest.java test/hotspot/jtreg/compiler/graalunit/JttExceptTest.java test/hotspot/jtreg/compiler/graalunit/JttHotpathTest.java test/hotspot/jtreg/compiler/graalunit/JttHotspotTest.java test/hotspot/jtreg/compiler/graalunit/JttJdkTest.java test/hotspot/jtreg/compiler/graalunit/JttLangALTest.java test/hotspot/jtreg/compiler/graalunit/JttLangMTest.java test/hotspot/jtreg/compiler/graalunit/JttLangNZTest.java test/hotspot/jtreg/compiler/graalunit/JttLoopTest.java test/hotspot/jtreg/compiler/graalunit/JttOptimizeTest.java test/hotspot/jtreg/compiler/graalunit/JttReflectAETest.java test/hotspot/jtreg/compiler/graalunit/JttReflectFTest.java test/hotspot/jtreg/compiler/graalunit/JttReflectGZTest.java test/hotspot/jtreg/compiler/graalunit/JttThreadsTest.java test/hotspot/jtreg/compiler/graalunit/LirJttTest.java test/hotspot/jtreg/compiler/graalunit/LoopTest.java test/hotspot/jtreg/compiler/graalunit/NodesTest.java test/hotspot/jtreg/compiler/graalunit/OptionsTest.java test/hotspot/jtreg/compiler/graalunit/PhasesCommonTest.java test/hotspot/jtreg/compiler/graalunit/ReplacementsTest.java test/hotspot/jtreg/compiler/graalunit/UtilTest.java test/hotspot/jtreg/compiler/graalunit/generateTests.sh test/jtreg-ext/requires/VMProps.java
diffstat 39 files changed, 39 insertions(+), 39 deletions(-) [+]
line wrap: on
line diff
--- a/test/hotspot/jtreg/compiler/graalunit/ApiDirectivesTest.java	Fri Jun 29 11:10:47 2018 +0200
+++ b/test/hotspot/jtreg/compiler/graalunit/ApiDirectivesTest.java	Fri Jun 29 13:43:35 2018 -0700
@@ -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	Fri Jun 29 11:10:47 2018 +0200
+++ b/test/hotspot/jtreg/compiler/graalunit/ApiTest.java	Fri Jun 29 13:43:35 2018 -0700
@@ -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	Fri Jun 29 11:10:47 2018 +0200
+++ b/test/hotspot/jtreg/compiler/graalunit/AsmAarch64Test.java	Fri Jun 29 13:43:35 2018 -0700
@@ -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	Fri Jun 29 11:10:47 2018 +0200
+++ b/test/hotspot/jtreg/compiler/graalunit/AsmAmd64Test.java	Fri Jun 29 13:43:35 2018 -0700
@@ -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	Fri Jun 29 11:10:47 2018 +0200
+++ b/test/hotspot/jtreg/compiler/graalunit/AsmSparcTest.java	Fri Jun 29 13:43:35 2018 -0700
@@ -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	Fri Jun 29 11:10:47 2018 +0200
+++ b/test/hotspot/jtreg/compiler/graalunit/CollectionsTest.java	Fri Jun 29 13:43:35 2018 -0700
@@ -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	Fri Jun 29 11:10:47 2018 +0200
+++ b/test/hotspot/jtreg/compiler/graalunit/CoreAmd64Test.java	Fri Jun 29 13:43:35 2018 -0700
@@ -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	Fri Jun 29 11:10:47 2018 +0200
+++ b/test/hotspot/jtreg/compiler/graalunit/CoreSparcTest.java	Fri Jun 29 13:43:35 2018 -0700
@@ -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	Fri Jun 29 11:10:47 2018 +0200
+++ b/test/hotspot/jtreg/compiler/graalunit/CoreTest.java	Fri Jun 29 13:43:35 2018 -0700
@@ -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	Fri Jun 29 11:10:47 2018 +0200
+++ b/test/hotspot/jtreg/compiler/graalunit/DebugTest.java	Fri Jun 29 13:43:35 2018 -0700
@@ -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	Fri Jun 29 11:10:47 2018 +0200
+++ b/test/hotspot/jtreg/compiler/graalunit/GraphTest.java	Fri Jun 29 13:43:35 2018 -0700
@@ -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	Fri Jun 29 11:10:47 2018 +0200
+++ b/test/hotspot/jtreg/compiler/graalunit/HotspotAmd64Test.java	Fri Jun 29 13:43:35 2018 -0700
@@ -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	Fri Jun 29 11:10:47 2018 +0200
+++ b/test/hotspot/jtreg/compiler/graalunit/HotspotLirTest.java	Fri Jun 29 13:43:35 2018 -0700
@@ -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	Fri Jun 29 11:10:47 2018 +0200
+++ b/test/hotspot/jtreg/compiler/graalunit/HotspotTest.java	Fri Jun 29 13:43:35 2018 -0700
@@ -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	Fri Jun 29 11:10:47 2018 +0200
+++ b/test/hotspot/jtreg/compiler/graalunit/Jtt.MicroTest.java	Fri Jun 29 13:43:35 2018 -0700
@@ -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	Fri Jun 29 11:10:47 2018 +0200
+++ b/test/hotspot/jtreg/compiler/graalunit/JttBackendTest.java	Fri Jun 29 13:43:35 2018 -0700
@@ -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	Fri Jun 29 11:10:47 2018 +0200
+++ b/test/hotspot/jtreg/compiler/graalunit/JttBytecodeTest.java	Fri Jun 29 13:43:35 2018 -0700
@@ -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	Fri Jun 29 11:10:47 2018 +0200
+++ b/test/hotspot/jtreg/compiler/graalunit/JttExceptTest.java	Fri Jun 29 13:43:35 2018 -0700
@@ -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	Fri Jun 29 11:10:47 2018 +0200
+++ b/test/hotspot/jtreg/compiler/graalunit/JttHotpathTest.java	Fri Jun 29 13:43:35 2018 -0700
@@ -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	Fri Jun 29 11:10:47 2018 +0200
+++ b/test/hotspot/jtreg/compiler/graalunit/JttHotspotTest.java	Fri Jun 29 13:43:35 2018 -0700
@@ -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	Fri Jun 29 11:10:47 2018 +0200
+++ b/test/hotspot/jtreg/compiler/graalunit/JttJdkTest.java	Fri Jun 29 13:43:35 2018 -0700
@@ -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	Fri Jun 29 11:10:47 2018 +0200
+++ b/test/hotspot/jtreg/compiler/graalunit/JttLangALTest.java	Fri Jun 29 13:43:35 2018 -0700
@@ -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	Fri Jun 29 11:10:47 2018 +0200
+++ b/test/hotspot/jtreg/compiler/graalunit/JttLangMTest.java	Fri Jun 29 13:43:35 2018 -0700
@@ -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	Fri Jun 29 11:10:47 2018 +0200
+++ b/test/hotspot/jtreg/compiler/graalunit/JttLangNZTest.java	Fri Jun 29 13:43:35 2018 -0700
@@ -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	Fri Jun 29 11:10:47 2018 +0200
+++ b/test/hotspot/jtreg/compiler/graalunit/JttLoopTest.java	Fri Jun 29 13:43:35 2018 -0700
@@ -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	Fri Jun 29 11:10:47 2018 +0200
+++ b/test/hotspot/jtreg/compiler/graalunit/JttOptimizeTest.java	Fri Jun 29 13:43:35 2018 -0700
@@ -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	Fri Jun 29 11:10:47 2018 +0200
+++ b/test/hotspot/jtreg/compiler/graalunit/JttReflectAETest.java	Fri Jun 29 13:43:35 2018 -0700
@@ -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	Fri Jun 29 11:10:47 2018 +0200
+++ b/test/hotspot/jtreg/compiler/graalunit/JttReflectFTest.java	Fri Jun 29 13:43:35 2018 -0700
@@ -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	Fri Jun 29 11:10:47 2018 +0200
+++ b/test/hotspot/jtreg/compiler/graalunit/JttReflectGZTest.java	Fri Jun 29 13:43:35 2018 -0700
@@ -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	Fri Jun 29 11:10:47 2018 +0200
+++ b/test/hotspot/jtreg/compiler/graalunit/JttThreadsTest.java	Fri Jun 29 13:43:35 2018 -0700
@@ -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	Fri Jun 29 11:10:47 2018 +0200
+++ b/test/hotspot/jtreg/compiler/graalunit/LirJttTest.java	Fri Jun 29 13:43:35 2018 -0700
@@ -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	Fri Jun 29 11:10:47 2018 +0200
+++ b/test/hotspot/jtreg/compiler/graalunit/LoopTest.java	Fri Jun 29 13:43:35 2018 -0700
@@ -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	Fri Jun 29 11:10:47 2018 +0200
+++ b/test/hotspot/jtreg/compiler/graalunit/NodesTest.java	Fri Jun 29 13:43:35 2018 -0700
@@ -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	Fri Jun 29 11:10:47 2018 +0200
+++ b/test/hotspot/jtreg/compiler/graalunit/OptionsTest.java	Fri Jun 29 13:43:35 2018 -0700
@@ -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	Fri Jun 29 11:10:47 2018 +0200
+++ b/test/hotspot/jtreg/compiler/graalunit/PhasesCommonTest.java	Fri Jun 29 13:43:35 2018 -0700
@@ -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	Fri Jun 29 11:10:47 2018 +0200
+++ b/test/hotspot/jtreg/compiler/graalunit/ReplacementsTest.java	Fri Jun 29 13:43:35 2018 -0700
@@ -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	Fri Jun 29 11:10:47 2018 +0200
+++ b/test/hotspot/jtreg/compiler/graalunit/UtilTest.java	Fri Jun 29 13:43:35 2018 -0700
@@ -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	Fri Jun 29 11:10:47 2018 +0200
+++ b/test/hotspot/jtreg/compiler/graalunit/generateTests.sh	Fri Jun 29 13:43:35 2018 -0700
@@ -54,7 +54,7 @@
 /*
  * @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	Fri Jun 29 11:10:47 2018 +0200
+++ b/test/jtreg-ext/requires/VMProps.java	Fri Jun 29 13:43:35 2018 -0700
@@ -251,7 +251,7 @@
      * @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);
     }