*** old/test/runtime/CompressedOops/ObjectAlignment.java	Sat Jun 13 09:00:39 2015
--- new/test/runtime/CompressedOops/ObjectAlignment.java	Sat Jun 13 09:00:38 2015

*** 37,61 ****
--- 37,62 ----
      public static void main(String[] args) throws Exception {
  
          if (Platform.is64bit()) {
              // Minimum alignment should be 8
              testObjectAlignment(4)
!                 .shouldContain("error: ObjectAlignmentInBytes=4 must be greater or equal 8")
!                 .shouldContain("outside the allowed range")
                  .shouldHaveExitValue(1);
  
              // Alignment has to be a power of 2
              testObjectAlignment(9)
-                 .shouldContain("error: ObjectAlignmentInBytes=9 must be power of 2")
                  .shouldHaveExitValue(1);
  
              testObjectAlignment(-1)
-                 .shouldContain("error: ObjectAlignmentInBytes=-1 must be power of 2")
+                 .shouldContain("outside the allowed range")
                  .shouldHaveExitValue(1);
  
              // Maximum alignment allowed is 256
              testObjectAlignment(512)
!                 .shouldContain("error: ObjectAlignmentInBytes=512 must not be greater than 256")
!                 .shouldContain("outside the allowed range")
                  .shouldHaveExitValue(1);
  
              // Valid alignments should work
              testObjectAlignment(8).shouldHaveExitValue(0);
              testObjectAlignment(16).shouldHaveExitValue(0);