test/compiler/startup/NumCompilerThreadsCheck.java

@  rev 7996 : 8075533: Zero JVM segfaults for -version after JDK-8074552
|

*** 36,57 ****
      OutputAnalyzer out = new OutputAnalyzer(pb.start());
  
      String expectedOutput = "CICompilerCount of -1 is invalid";
      out.shouldContain(expectedOutput);
  
!     if (isZeroVm()) {
        String expectedLowWaterMarkText = "must be at least 0";
        out.shouldContain(expectedLowWaterMarkText);
      }
    }
  
-   private static boolean isZeroVm() {
-     String vmName = System.getProperty("java.vm.name");
-     if (vmName == null) {
-       throw new RuntimeException("No VM name");
-     }
-     if (vmName.toLowerCase().contains("zero")) {
-       return true;
-     }
-     return false;
-   }
  }
--- 36,47 ----
      OutputAnalyzer out = new OutputAnalyzer(pb.start());
  
      String expectedOutput = "CICompilerCount of -1 is invalid";
      out.shouldContain(expectedOutput);
  
!     if (Platform.isZero()) {
        String expectedLowWaterMarkText = "must be at least 0";
        out.shouldContain(expectedLowWaterMarkText);
      }
    }
  
  }