--- old/test/runtime/contended/Options.java 2015-06-13 09:00:39.000000000 -0500 +++ new/test/runtime/contended/Options.java 2015-06-13 09:00:39.000000000 -0500 @@ -42,19 +42,19 @@ 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); @@ -89,14 +89,14 @@ 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); }