Fix VMProps.java

corretto · Apr 29, 2020 · b6b333d · b6b333d
1 parent 760aa1b
commit b6b333d
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/src/test/jdk/TEST.ROOT b/src/test/jdk/TEST.ROOT
@@ -46,11 +46,8 @@ requires.properties= \
     vm.compiler1.enabled \
     vm.compiler2.enabled \
     vm.cds \
-<<<<<<< HEAD
     vm.debug \
-=======
     vm.musl \
->>>>>>> 357b428d9... Portola patch
     vm.hasSA \
     vm.hasSAandCanAttach \
     vm.hasJFR \

diff --git a/src/test/jtreg-ext/requires/VMProps.java b/src/test/jtreg-ext/requires/VMProps.java
@@ -118,7 +118,7 @@ public Map<String, String> call() {
         map.put("vm.compiler1.enabled", this::isCompiler1Enabled);
         map.put("vm.compiler2.enabled", this::isCompiler2Enabled);
         map.put("docker.support", this::dockerSupport);
-        map.put("vm.musl", this::isMusl());
+        map.put("vm.musl", this::isMusl);
         map.put("release.implementor", this::implementor);
         vmGC(map); // vm.gc.X = true/false
         vmOptFinalFlags(map);