--- a/test/hotspot/jtreg/serviceability/sa/TestUniverse.java Tue Jun 26 09:52:21 2018 -0400
+++ b/test/hotspot/jtreg/serviceability/sa/TestUniverse.java Mon Jun 25 23:04:21 2018 +0200
@@ -33,10 +33,10 @@
import jdk.test.lib.Platform;
import jdk.test.lib.process.OutputAnalyzer;
-/*
+/**
* @test
* @summary Test the 'universe' command of jhsdb clhsdb.
- * @requires vm.gc != "Z"
+ * @requires vm.hasSAandCanAttach & vm.gc != "Z"
* @bug 8190307
* @library /test/lib
* @build jdk.test.lib.apps.*
@@ -45,10 +45,10 @@
* @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. TestUniverse withoutZ
*/
-/*
+/**
* @test
* @summary Test the 'universe' command of jhsdb clhsdb.
- * @requires vm.gc == "Z"
+ * @requires vm.hasSAandCanAttach & vm.gc == "Z"
* @bug 8190307
* @library /test/lib
* @build jdk.test.lib.apps.*
@@ -147,13 +147,6 @@
public static void main (String... args) throws Exception {
-
- if (!Platform.shouldSAAttach()) {
- System.out.println(
- "SA attach not expected to work - test skipped.");
- return;
- }
-
try {
test("-XX:+UseG1GC");
test("-XX:+UseParallelGC");