*** old/test/runtime/contended/Options.java	Thu Jun 25 16:48:35 2015
--- new/test/runtime/contended/Options.java	Thu Jun 25 16:48:35 2015

*** 53,63 ****
--- 53,62 ----
  
          pb = ProcessTools.createJavaProcessBuilder("-XX:ContendedPaddingWidth=-1", "-version");
          output = new OutputAnalyzer(pb.start());
          output.shouldContain("ContendedPaddingWidth");
          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());
          output.shouldHaveExitValue(0);

*** 88,98 ****
--- 87,96 ----
  
          pb = ProcessTools.createJavaProcessBuilder("-XX:ContendedPaddingWidth=8193", "-version");
          output = new OutputAnalyzer(pb.start());
          output.shouldContain("ContendedPaddingWidth");
          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");