*** old/test/runtime/contended/Options.java	Sat Jun 13 09:00:39 2015
--- new/test/runtime/contended/Options.java	Sat Jun 13 09:00:39 2015

*** 40,62 ****
--- 40,62 ----
          OutputAnalyzer output;
  
          pb = ProcessTools.createJavaProcessBuilder("-XX:ContendedPaddingWidth=-128", "-version");
          output = new OutputAnalyzer(pb.start());
          output.shouldContain("ContendedPaddingWidth");
!         output.shouldContain("must be in between");
!         output.shouldContain("outside the allowed range");
          output.shouldHaveExitValue(1);
  
          pb = ProcessTools.createJavaProcessBuilder("-XX:ContendedPaddingWidth=-8", "-version");
          output = new OutputAnalyzer(pb.start());
          output.shouldContain("ContendedPaddingWidth");
!         output.shouldContain("must be in between");
!         output.shouldContain("outside the allowed range");
          output.shouldHaveExitValue(1);
  
          pb = ProcessTools.createJavaProcessBuilder("-XX:ContendedPaddingWidth=-1", "-version");
          output = new OutputAnalyzer(pb.start());
          output.shouldContain("ContendedPaddingWidth");
!         output.shouldContain("must be in between");
!         output.shouldContain("outside the allowed range");
          output.shouldContain("must be a multiple of 8");
          output.shouldHaveExitValue(1);
  
          pb = ProcessTools.createJavaProcessBuilder("-XX:ContendedPaddingWidth=0", "-version");
          output = new OutputAnalyzer(pb.start());

*** 87,104 ****
--- 87,104 ----
          output.shouldHaveExitValue(0);
  
          pb = ProcessTools.createJavaProcessBuilder("-XX:ContendedPaddingWidth=8193", "-version");
          output = new OutputAnalyzer(pb.start());
          output.shouldContain("ContendedPaddingWidth");
!         output.shouldContain("must be in between");
!         output.shouldContain("outside the allowed range");
          output.shouldContain("must be a multiple of 8");
          output.shouldHaveExitValue(1);
  
          pb = ProcessTools.createJavaProcessBuilder("-XX:ContendedPaddingWidth=8200", "-version"); // 8192+8 = 8200
          output = new OutputAnalyzer(pb.start());
          output.shouldContain("ContendedPaddingWidth");
!         output.shouldContain("must be in between");
!         output.shouldContain("outside the allowed range");
          output.shouldHaveExitValue(1);
  
     }
  
  }