Mercurial > jdk8-mips64-public > hotspot / file diff

     1.1 --- a/test/runtime/SharedArchiveFile/CdsDifferentObjectAlignment.java	Fri Sep 19 02:23:20 2014 -0700
     1.2 +++ b/test/runtime/SharedArchiveFile/CdsDifferentObjectAlignment.java	Fri Sep 19 11:12:39 2014 -0400
     1.3 @@ -1,5 +1,5 @@
     1.4  /*
     1.5 - * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
     1.6 + * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
     1.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.8   *
     1.9   * This code is free software; you can redistribute it and/or modify it
    1.10 @@ -29,6 +29,7 @@
    1.11   *          is different from object alignment for creating a CDS file
    1.12   *          should fail when loading.
    1.13   * @library /testlibrary
    1.14 + * @bug 8025642
    1.15   */
    1.16  
    1.17  import com.oracle.java.testlibrary.*;
    1.18 @@ -82,7 +83,11 @@
    1.19              createAlignment,
    1.20              loadAlignment);
    1.21  
    1.22 -        output.shouldContain(expectedErrorMsg);
    1.23 +        try {
    1.24 +            output.shouldContain(expectedErrorMsg);
    1.25 +        } catch (RuntimeException e) {
    1.26 +            output.shouldContain("Unable to use shared archive");
    1.27 +        }
    1.28          output.shouldHaveExitValue(1);
    1.29      }
    1.30  }