test/hotspot/jtreg/compiler/intrinsics/sha/cli/testcases/GenericTestCaseForOtherCPU.java

rev 59103 : imported patch hotspot

*** 30,60 ****
  import jdk.test.lib.cli.predicate.NotPredicate;
  import jdk.test.lib.cli.predicate.OrPredicate;
  
  /**
   * Generic test case for SHA-related options targeted to any CPU except
!  * AArch64, PPC, S390x, SPARC and X86.
   */
  public class GenericTestCaseForOtherCPU extends
          SHAOptionsBase.TestCase {
      public GenericTestCaseForOtherCPU(String optionName) {
!         // Execute the test case on any CPU except AArch64, PPC, S390x, SPARC and X86.
          super(optionName, new NotPredicate(
                                new OrPredicate(Platform::isAArch64,
                                new OrPredicate(Platform::isS390x,
-                               new OrPredicate(Platform::isSparc,
                                new OrPredicate(Platform::isPPC,
                                new OrPredicate(Platform::isX64,
!                                               Platform::isX86)))))));
      }
  
      @Override
      protected void verifyWarnings() throws Throwable {
          String shouldPassMessage = String.format("JVM should start with "
                  + "option '%s' without any warnings", optionName);
!         // Verify that on non-x86, non-SPARC and non-AArch64 CPU usage of
!         //  SHA-related options will not cause any warnings.
          CommandLineOptionTest.verifySameJVMStartup(null,
                  new String[] { ".*" + optionName + ".*" }, shouldPassMessage,
                  shouldPassMessage, ExitCode.OK,
                  SHAOptionsBase.UNLOCK_DIAGNOSTIC_VM_OPTIONS,
                  CommandLineOptionTest.prepareBooleanFlag(optionName, true));
--- 30,59 ----
  import jdk.test.lib.cli.predicate.NotPredicate;
  import jdk.test.lib.cli.predicate.OrPredicate;
  
  /**
   * Generic test case for SHA-related options targeted to any CPU except
!  * AArch64, PPC, S390x, and X86.
   */
  public class GenericTestCaseForOtherCPU extends
          SHAOptionsBase.TestCase {
      public GenericTestCaseForOtherCPU(String optionName) {
!         // Execute the test case on any CPU except AArch64, PPC, S390x, and X86.
          super(optionName, new NotPredicate(
                                new OrPredicate(Platform::isAArch64,
                                new OrPredicate(Platform::isS390x,
                                new OrPredicate(Platform::isPPC,
                                new OrPredicate(Platform::isX64,
!                                               Platform::isX86))))));
      }
  
      @Override
      protected void verifyWarnings() throws Throwable {
          String shouldPassMessage = String.format("JVM should start with "
                  + "option '%s' without any warnings", optionName);
!         // Verify that on non-x86 and non-AArch64 CPU usage of SHA-related
!         // options will not cause any warnings.
          CommandLineOptionTest.verifySameJVMStartup(null,
                  new String[] { ".*" + optionName + ".*" }, shouldPassMessage,
                  shouldPassMessage, ExitCode.OK,
                  SHAOptionsBase.UNLOCK_DIAGNOSTIC_VM_OPTIONS,
                  CommandLineOptionTest.prepareBooleanFlag(optionName, true));