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

*** 48,84 ****
          // 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,
                  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));
      }
  }
--- 48,89 ----
          // 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));
  
          CommandLineOptionTest.verifySameJVMStartup(null,
                  new String[] { ".*" + optionName + ".*" }, shouldPassMessage,
                  shouldPassMessage, ExitCode.OK,
+                 SHAOptionsBase.UNLOCK_DIAGNOSTIC_VM_OPTIONS,
                  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),
!                 SHAOptionsBase.UNLOCK_DIAGNOSTIC_VM_OPTIONS);
  
          // 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),
+                 SHAOptionsBase.UNLOCK_DIAGNOSTIC_VM_OPTIONS,
                  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)),
+                 SHAOptionsBase.UNLOCK_DIAGNOSTIC_VM_OPTIONS,
                  CommandLineOptionTest.prepareBooleanFlag(optionName, false));
      }
  }