*** old/test/compiler/arguments/TestUseCountTrailingZerosInstructionOnSupportedCPU.java	Mon May 12 22:20:20 2014
--- new/test/compiler/arguments/TestUseCountTrailingZerosInstructionOnSupportedCPU.java	Mon May 12 22:20:20 2014

*** 39,70 ****
--- 39,69 ----
  import com.oracle.java.testlibrary.*;
  import com.oracle.java.testlibrary.cli.*;
  
  public class TestUseCountTrailingZerosInstructionOnSupportedCPU
          extends BMISupportedCPUTest {
+     private static final String DISABLE_BMI = "-XX:-UseBMI1Instructions";
  
      public TestUseCountTrailingZerosInstructionOnSupportedCPU() {
          super("UseCountTrailingZerosInstruction", TZCNT_WARNING, "bmi1");
      }
  
      @Override
      public void runTestCases() throws Throwable {
  
          super.runTestCases();
  
!         // verify that option will be disabled if all BMI1 instuctions
!         // verify that option will be disabled if all BMI1 instructions
          // are explicitly disabled
!         CommandLineOptionTest.verifyOptionValueForSameVM(optionName, "false",
              verifyOptionValue("UseCountTrailingZerosInstruction", "false",
                                "-XX:-UseBMI1Instructions");
+                 TestUseCountTrailingZerosInstructionOnSupportedCPU.DISABLE_BMI);
  
          // verify that option could be turned on even if other BMI1
          // instructions were turned off
!         CommandLineOptionTest.verifyOptionValueForSameVM(optionName, "true",
!             verifyOptionValue("UseCountTrailingZerosInstruction", "true",
                                "-XX:-UseBMI1Instructions",
                                "-XX:+UseCountTrailingZerosInstruction");
!                 TestUseCountTrailingZerosInstructionOnSupportedCPU.DISABLE_BMI,
+                 CommandLineOptionTest.prepareBooleanFlag(optionName, true));
      }
  
      public static void main(String args[]) throws Throwable {
          new TestUseCountTrailingZerosInstructionOnSupportedCPU().test();
      }