*** old/test/compiler/arguments/BMICommandLineOptionTestBase.java	Thu May 22 21:42:34 2014
--- new/test/compiler/arguments/BMICommandLineOptionTestBase.java	Thu May 22 21:42:34 2014

*** 23,32 ****
--- 23,38 ----
  
  import com.oracle.java.testlibrary.cli.*;
  
  /**
   * Base class for all X86 bit manipulation related command line options.
+  *
+  * Note that this test intended to verify that VM could be launched with
+  * specific options and that values of these options processed correctly.
+  * In order to do that test launch a new VM with tested options, the same
+  * flavor-specific flag as one that was used for parent VM (-client, -server,
+  * -minimal, -graal) and '-version'.
   */
  public abstract class BMICommandLineOptionTestBase
                extends CPUSpecificCommandLineOptionTest {
  
      public static final String LZCNT_WARNING =

*** 58,68 ****
--- 64,75 ----
                                          String supportedCPUFeatures[],
                                          String unsupportedCPUFeatures[]) {
          super(".*", supportedCPUFeatures, unsupportedCPUFeatures);
          this.optionName = optionName;
          this.warningMessage = warningMessage;
              this.errorMessage = CommandLineOptionTest.
                  UNRECOGNIZED_OPTION_ERROR_FORMAT.format(optionName);
+         this.errorMessage = String.format(
+                 CommandLineOptionTest.UNRECOGNIZED_OPTION_ERROR_FORMAT,
+                 optionName);
      }
  
  }