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

*** 47,56 ****
--- 47,57 ----
                  + " '%s' without any warnings", optionName);
          // Verify that there are no warning when option is explicitly enabled.
          CommandLineOptionTest.verifySameJVMStartup(null, new String[] {
                          SHAOptionsBase.getWarningForUnsupportedCPU(optionName)
                  }, shouldPassMessage, shouldPassMessage, ExitCode.OK,
+                 SHAOptionsBase.UNLOCK_DIAGNOSTIC_VM_OPTIONS,
                  CommandLineOptionTest.prepareBooleanFlag(optionName, true));
  
          // Verify that option could be disabled even if +UseSHA was passed to
          // JVM.
          CommandLineOptionTest.verifySameJVMStartup(null, new String[] {
*** 58,67 ****
--- 59,69 ----
                  }, shouldPassMessage, String.format("It should be able to "
                          + "disable option '%s' even if %s was passed to JVM",
                          optionName, CommandLineOptionTest.prepareBooleanFlag(
                              SHAOptionsBase.USE_SHA_OPTION, true)),
                  ExitCode.OK,
+                 SHAOptionsBase.UNLOCK_DIAGNOSTIC_VM_OPTIONS,
                  CommandLineOptionTest.prepareBooleanFlag(
                          SHAOptionsBase.USE_SHA_OPTION, true),
                  CommandLineOptionTest.prepareBooleanFlag(optionName, false));
  
          if (!optionName.equals(SHAOptionsBase.USE_SHA_OPTION)) {
*** 73,82 ****
--- 75,85 ----
                      shouldPassMessage,
                      String.format("Enabling option '%s' should not be possible and should result in a warning if %s was passed to JVM",
                                    optionName,
                                    CommandLineOptionTest.prepareBooleanFlag(SHAOptionsBase.USE_SHA_OPTION, false)),
                      ExitCode.OK,
+                     SHAOptionsBase.UNLOCK_DIAGNOSTIC_VM_OPTIONS,
                      CommandLineOptionTest.prepareBooleanFlag(SHAOptionsBase.USE_SHA_OPTION, false),
                      CommandLineOptionTest.prepareBooleanFlag(optionName, true));
          }
      }
  
*** 84,113 ****
      protected void verifyOptionValues() throws Throwable {
          // Verify that "It should be able to disable option "
  
          CommandLineOptionTest.verifyOptionValueForSameVM(optionName, "true",
                  String.format("Option '%s' should be enabled by default",
!                         optionName));
  
          // Verify that it is possible to explicitly enable the option.
          CommandLineOptionTest.verifyOptionValueForSameVM(optionName, "true",
                  String.format("Option '%s' was set to have value 'true'",
                          optionName),
                  CommandLineOptionTest.prepareBooleanFlag(optionName, true));
  
          // Verify that it is possible to explicitly disable the option.
          CommandLineOptionTest.verifyOptionValueForSameVM(optionName, "false",
                  String.format("Option '%s' was set to have value 'false'",
                          optionName),
                  CommandLineOptionTest.prepareBooleanFlag(optionName, false));
  
          // verify that option is disabled when -UseSHA was passed to JVM.
          CommandLineOptionTest.verifyOptionValueForSameVM(optionName, "false",
                  String.format("Option '%s' should have value 'false' when %s"
                          + " flag set to JVM", optionName,
                          CommandLineOptionTest.prepareBooleanFlag(
                              SHAOptionsBase.USE_SHA_OPTION, false)),
                  CommandLineOptionTest.prepareBooleanFlag(optionName, true),
                  CommandLineOptionTest.prepareBooleanFlag(
                          SHAOptionsBase.USE_SHA_OPTION, false));
  
          // Verify that it is possible to explicitly disable the tested option
--- 87,120 ----
      protected void verifyOptionValues() throws Throwable {
          // Verify that "It should be able to disable option "
  
          CommandLineOptionTest.verifyOptionValueForSameVM(optionName, "true",
                  String.format("Option '%s' should be enabled by default",
!                         optionName),
!                 SHAOptionsBase.UNLOCK_DIAGNOSTIC_VM_OPTIONS);
  
          // Verify that it is possible to explicitly enable the option.
          CommandLineOptionTest.verifyOptionValueForSameVM(optionName, "true",
                  String.format("Option '%s' was set to have value 'true'",
                          optionName),
+                 SHAOptionsBase.UNLOCK_DIAGNOSTIC_VM_OPTIONS,
                  CommandLineOptionTest.prepareBooleanFlag(optionName, true));
  
          // Verify that it is possible to explicitly disable the option.
          CommandLineOptionTest.verifyOptionValueForSameVM(optionName, "false",
                  String.format("Option '%s' was set to have value 'false'",
                          optionName),
+                 SHAOptionsBase.UNLOCK_DIAGNOSTIC_VM_OPTIONS,
                  CommandLineOptionTest.prepareBooleanFlag(optionName, false));
  
          // verify that option is disabled when -UseSHA was passed to JVM.
          CommandLineOptionTest.verifyOptionValueForSameVM(optionName, "false",
                  String.format("Option '%s' should have value 'false' when %s"
                          + " flag set to JVM", optionName,
                          CommandLineOptionTest.prepareBooleanFlag(
                              SHAOptionsBase.USE_SHA_OPTION, false)),
+                 SHAOptionsBase.UNLOCK_DIAGNOSTIC_VM_OPTIONS,
                  CommandLineOptionTest.prepareBooleanFlag(optionName, true),
                  CommandLineOptionTest.prepareBooleanFlag(
                          SHAOptionsBase.USE_SHA_OPTION, false));
  
          // Verify that it is possible to explicitly disable the tested option
*** 115,124 ****
--- 122,132 ----
          CommandLineOptionTest.verifyOptionValueForSameVM(optionName, "false",
                  String.format("Option '%s' should have value 'false' if set so"
                          + " 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),
                  CommandLineOptionTest.prepareBooleanFlag(optionName, false));
      }
  }