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

*** 39,70 ****
                  new OrPredicate(Platform::isX64, Platform::isX86))));
      }
  
      @Override
      protected void verifyWarnings() throws Throwable {
          // Verify that on non-x86 and non-SPARC CPU usage of SHA-related
          // options will not cause any warnings.
          CommandLineOptionTest.verifySameJVMStartup(null,
!                 new String[] { ".*" + optionName + ".*" }, ExitCode.OK,
                  CommandLineOptionTest.prepareBooleanFlag(optionName, true));
  
          CommandLineOptionTest.verifySameJVMStartup(null,
!                 new String[] { ".*" + optionName + ".*" }, ExitCode.OK,
                  CommandLineOptionTest.prepareBooleanFlag(optionName, false));
      }
  
      @Override
      protected void verifyOptionValues() throws Throwable {
          // Verify that option is disabled by default.
!         CommandLineOptionTest.verifyOptionValueForSameVM(optionName, "false");
  
          // Verify that option is disabled even if it was explicitly enabled
          // using CLI options.
          CommandLineOptionTest.verifyOptionValueForSameVM(optionName, "false",
                  CommandLineOptionTest.prepareBooleanFlag(optionName, true));
  
          // Verify that option is disabled when it explicitly disabled
          // using CLI options.
          CommandLineOptionTest.verifyOptionValueForSameVM(optionName, "false",
                  CommandLineOptionTest.prepareBooleanFlag(optionName, false));
      }
  }
--- 39,82 ----
                  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-SPARC CPU usage of SHA-related
          // options will not cause any warnings.
          CommandLineOptionTest.verifySameJVMStartup(null,
!                 new String[] { ".*" + optionName + ".*" }, shouldPassMessage,
!                 shouldPassMessage, ExitCode.OK,
                  CommandLineOptionTest.prepareBooleanFlag(optionName, true));
  
          CommandLineOptionTest.verifySameJVMStartup(null,
!                 new String[] { ".*" + optionName + ".*" }, shouldPassMessage,
!                 shouldPassMessage, ExitCode.OK,
                  CommandLineOptionTest.prepareBooleanFlag(optionName, false));
      }
  
      @Override
      protected void verifyOptionValues() throws Throwable {
          // Verify that option is disabled by default.
!         CommandLineOptionTest.verifyOptionValueForSameVM(optionName, "false",
!                 String.format("Option '%s' should be disabled by default",
!                         optionName));
  
          // Verify that option is disabled even if it was explicitly enabled
          // using CLI options.
          CommandLineOptionTest.verifyOptionValueForSameVM(optionName, "false",
+                 String.format("Option '%s' should be off on unsupported "
+                         + "CPU even if set to true directly", optionName),
                  CommandLineOptionTest.prepareBooleanFlag(optionName, true));
  
          // Verify that option is disabled when it explicitly disabled
          // using CLI options.
          CommandLineOptionTest.verifyOptionValueForSameVM(optionName, "false",
+                 String.format("Option '%s' should be off on unsupported CPU"
+                         + " even if '%s' flag set to JVM", optionName,
+                         CommandLineOptionTest.prepareBooleanFlag(
+                         SHAOptionsBase.USE_SHA_OPTION, true)),
                  CommandLineOptionTest.prepareBooleanFlag(optionName, false));
      }
  }