test/compiler/arguments/BMISupportedCPUTest.java

*** 58,92 ****
          /*
            Verify that VM will successfully start up without warnings.
            VM will be launched with following flags:
            -XX:+<tested option> -version
          */
          CommandLineOptionTest.verifySameJVMStartup(null,
!                 new String[] { warningMessage }, ExitCode.OK,
                  CommandLineOptionTest.prepareBooleanFlag(optionName, true));
  
          /*
            Verify that VM will successfully start up without warnings.
            VM will be launched with following flags:
            -XX:-<tested option> -version
          */
          CommandLineOptionTest.verifySameJVMStartup(null,
!                 new String[] { warningMessage }, ExitCode.OK,
                  CommandLineOptionTest.prepareBooleanFlag(optionName, false));
  
          /*
            Verify that on appropriate CPU option in on by default.
            VM will be launched with following flags:
            -version
          */
!         CommandLineOptionTest.verifyOptionValueForSameVM(optionName, "true");
  
          /*
            Verify that option could be explicitly turned off.
            VM will be launched with following flags:
            -XX:-<tested option> -version
          */
          CommandLineOptionTest.verifyOptionValueForSameVM(optionName, "false",
                  CommandLineOptionTest.prepareBooleanFlag(optionName, false));
      }
  }
  
--- 58,102 ----
          /*
            Verify that VM will successfully start up without warnings.
            VM will be launched with following flags:
            -XX:+<tested option> -version
          */
+         String errorString = String.format("JVM should start with '-XX:+%s'"
+                 + " flag without any warnings", optionName);
          CommandLineOptionTest.verifySameJVMStartup(null,
!                 new String[] { warningMessage }, errorString, errorString,
!                 ExitCode.OK,                
                  CommandLineOptionTest.prepareBooleanFlag(optionName, true));
  
          /*
            Verify that VM will successfully start up without warnings.
            VM will be launched with following flags:
            -XX:-<tested option> -version
          */
+         errorString = String.format("JVM should start with '-XX:-%s'"
+                 + " flag without any warnings", optionName);
          CommandLineOptionTest.verifySameJVMStartup(null,
!                 new String[] { warningMessage }, errorString,
!                 errorString, ExitCode.OK,
                  CommandLineOptionTest.prepareBooleanFlag(optionName, false));
  
          /*
            Verify that on appropriate CPU option in on by default.
            VM will be launched with following flags:
            -version
          */
!         CommandLineOptionTest.verifyOptionValueForSameVM(optionName, "true",
!                 String.format("Option '%s' is expected to have default value "
!                     + "'true'", optionName));
  
          /*
            Verify that option could be explicitly turned off.
            VM will be launched with following flags:
            -XX:-<tested option> -version
          */
          CommandLineOptionTest.verifyOptionValueForSameVM(optionName, "false",
+                 String.format("Option '%s' is set to have value 'false'",
+                     optionName),
                  CommandLineOptionTest.prepareBooleanFlag(optionName, false));
      }
  }