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

*** 45,54 ****
--- 45,55 ----
                  + "option '-XX:-%s' without any warnings", optionName);
          //Verify that option could be disabled without any warnings.
          CommandLineOptionTest.verifySameJVMStartup(null, new String[] {
                          SHAOptionsBase.getWarningForUnsupportedCPU(optionName)
                  }, shouldPassMessage, shouldPassMessage, ExitCode.OK,
+                 SHAOptionsBase.UNLOCK_DIAGNOSTIC_VM_OPTIONS,
                  CommandLineOptionTest.prepareBooleanFlag(optionName, false));
  
          // Verify that when the tested option is enabled, then
          // a warning will occur in VM output if UseSHA is disabled.
          if (!optionName.equals(SHAOptionsBase.USE_SHA_OPTION)) {
*** 56,89 ****
                      new String[] { SHAOptionsBase.getWarningForUnsupportedCPU(optionName) },
                      null,
                      shouldPassMessage,
                      shouldPassMessage,
                      ExitCode.OK,
                      CommandLineOptionTest.prepareBooleanFlag(SHAOptionsBase.USE_SHA_OPTION, false),
                      CommandLineOptionTest.prepareBooleanFlag(optionName, true));
          }
      }
  
      @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 "
                          + "SparcCPU even if set to true directly", optionName),
                  CommandLineOptionTest.prepareBooleanFlag(optionName, true));
  
          // Verify that option is disabled when +UseSHA was passed to JVM.
          CommandLineOptionTest.verifyOptionValueForSameVM(optionName, "false",
                  String.format("Option '%s' should be off on unsupported "
                          + "SparcCPU even if %s flag set to JVM",
                          optionName, CommandLineOptionTest.prepareBooleanFlag(
                              SHAOptionsBase.USE_SHA_OPTION, true)),
                  CommandLineOptionTest.prepareBooleanFlag(
                          SHAOptionsBase.USE_SHA_OPTION, true));
      }
  }
--- 57,94 ----
                      new String[] { SHAOptionsBase.getWarningForUnsupportedCPU(optionName) },
                      null,
                      shouldPassMessage,
                      shouldPassMessage,
                      ExitCode.OK,
+                     SHAOptionsBase.UNLOCK_DIAGNOSTIC_VM_OPTIONS,
                      CommandLineOptionTest.prepareBooleanFlag(SHAOptionsBase.USE_SHA_OPTION, false),
                      CommandLineOptionTest.prepareBooleanFlag(optionName, true));
          }
      }
  
      @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 "
                          + "SparcCPU even if set to true directly", optionName),
+                 SHAOptionsBase.UNLOCK_DIAGNOSTIC_VM_OPTIONS,
                  CommandLineOptionTest.prepareBooleanFlag(optionName, true));
  
          // Verify that option is disabled when +UseSHA was passed to JVM.
          CommandLineOptionTest.verifyOptionValueForSameVM(optionName, "false",
                  String.format("Option '%s' should be off on unsupported "
                          + "SparcCPU even if %s flag set to JVM",
                          optionName, CommandLineOptionTest.prepareBooleanFlag(
                              SHAOptionsBase.USE_SHA_OPTION, true)),
+                 SHAOptionsBase.UNLOCK_DIAGNOSTIC_VM_OPTIONS,
                  CommandLineOptionTest.prepareBooleanFlag(
                          SHAOptionsBase.USE_SHA_OPTION, true));
      }
  }