Mercurial > hg > truffle

diff test/runtime/SharedArchiveFile/CdsDifferentObjectAlignment.java @ 20488:9c8439756c05

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8052313: Backport CDS tests from JDK-9 to jdk8_u40 Summary: Copied CDS tests from jdk-9 to jdk8u40 Reviewed-by: ccheung, dholmes
author mseledtsov
date Fri, 19 Sep 2014 11:12:39 -0400
parents 1e9094165098
children 7848fc12602b
line wrap: on
line diff
--- a/test/runtime/SharedArchiveFile/CdsDifferentObjectAlignment.java	Fri Sep 19 02:23:20 2014 -0700
+++ b/test/runtime/SharedArchiveFile/CdsDifferentObjectAlignment.java	Fri Sep 19 11:12:39 2014 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@
  *          is different from object alignment for creating a CDS file
  *          should fail when loading.
  * @library /testlibrary
+ * @bug 8025642
  */
 
 import com.oracle.java.testlibrary.*;
@@ -82,7 +83,11 @@
             createAlignment,
             loadAlignment);
 
-        output.shouldContain(expectedErrorMsg);
+        try {
+            output.shouldContain(expectedErrorMsg);
+        } catch (RuntimeException e) {
+            output.shouldContain("Unable to use shared archive");
+        }
         output.shouldHaveExitValue(1);
     }
 }