8290846: sun/tools/jstatd/JstatdTest* tests should use VM options

Reviewed-by: cjplummer, sspitsyn

Author: lmesnik

test/jdk/sun/tools/jstatd/JstatGCUtilParser.java

@@ -43,9 +43,9 @@ public enum GcStatisticsType {
     }
 
     public enum GcStatistics {
-        S0(GcStatisticsType.PERCENTAGE),
-        S1(GcStatisticsType.PERCENTAGE),
-        E(GcStatisticsType.PERCENTAGE),
+        S0(GcStatisticsType.PERCENTAGE_OR_DASH),
+        S1(GcStatisticsType.PERCENTAGE_OR_DASH),
+        E(GcStatisticsType.PERCENTAGE_OR_DASH),
         O(GcStatisticsType.PERCENTAGE),
         M(GcStatisticsType.PERCENTAGE_OR_DASH),
         CCS(GcStatisticsType.PERCENTAGE_OR_DASH),

test/jdk/sun/tools/jstatd/JstatdTest.java

@@ -128,7 +128,6 @@ private String getDestination() throws UnknownHostException {
      */
     private OutputAnalyzer runJps() throws Exception {
         JDKToolLauncher launcher = JDKToolLauncher.createUsingTestJDK("jps");
-        launcher.addVMArgs(Utils.getFilteredTestJavaOpts("-XX:+UsePerfData"));
         launcher.addVMArg("-XX:+UsePerfData");
         launcher.addToolArg(getDestination());
 
@@ -252,6 +251,7 @@ private void cleanUpThread(ProcessThread thread) throws Throwable {
      */
     private String[] getJstatdCmd() throws Exception {
         JDKToolLauncher launcher = JDKToolLauncher.createUsingTestJDK("jstatd");
+        launcher.addVMArgs(Utils.getTestJavaOpts());
         launcher.addVMArg("-XX:+UsePerfData");
         String testSrc = System.getProperty("test.src");
         if (port != null) {