test/compiler/rtm/cli/RTMLockingAwareTest.java

*** 129,142 ****
          if (isExperimental) {
              options.add(CommandLineOptionTest.UNLOCK_EXPERIMENTAL_VM_OPTIONS);
          }
          options.add(prepareOptionValue(value));
  
          CommandLineOptionTest.verifySameJVMStartup(
                  (isWarningExpected ? warnings : null),
                  (isWarningExpected ? null : warnings),
!                 ExitCode.OK, options.toArray(new String[options.size()]));
      }
  
      private void verifyOptionValues(String value, boolean useRTMLocking,
              String expectedValue) throws Throwable {
          List<String> options = new LinkedList<>();
--- 129,146 ----
          if (isExperimental) {
              options.add(CommandLineOptionTest.UNLOCK_EXPERIMENTAL_VM_OPTIONS);
          }
          options.add(prepareOptionValue(value));
  
+         String errorString =  String.format("JVM should start with option '%s'"
+                 + "'%nWarnings should be shown: %s", optionName,
+                 isWarningExpected);
          CommandLineOptionTest.verifySameJVMStartup(
                  (isWarningExpected ? warnings : null),
                  (isWarningExpected ? null : warnings),
!                 errorString, errorString, ExitCode.OK,
!                 options.toArray(new String[options.size()]));
      }
  
      private void verifyOptionValues(String value, boolean useRTMLocking,
              String expectedValue) throws Throwable {
          List<String> options = new LinkedList<>();
*** 147,154 ****
              options.add(CommandLineOptionTest.UNLOCK_EXPERIMENTAL_VM_OPTIONS);
          }
          options.add(prepareOptionValue(value));
  
          CommandLineOptionTest.verifyOptionValueForSameVM(optionName,
!                 expectedValue, options.toArray(new String[options.size()]));
      }
  }
--- 151,161 ----
              options.add(CommandLineOptionTest.UNLOCK_EXPERIMENTAL_VM_OPTIONS);
          }
          options.add(prepareOptionValue(value));
  
          CommandLineOptionTest.verifyOptionValueForSameVM(optionName,
!                 expectedValue, String.format("Option '%s' should have '%s' "
!                         + "value if '%s' flag set",
!                         optionName, expectedValue, prepareOptionValue(value)),
!                 options.toArray(new String[options.size()]));
      }
  }