< prev index next >

test/gc/g1/Test2GbHeap.java

Print this page

        

@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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
  * under the terms of the GNU General Public License version 2 only, as
  * published by the Free Software Foundation.

@@ -51,11 +51,11 @@
 
     // Avoid failing test for setups not supported.
     if (output.getOutput().contains("Could not reserve enough space for 2097152KB object heap")) {
       // Will fail on machines with too little memory (and Windows 32-bit VM), ignore such failures.
       output.shouldHaveExitValue(1);
-    } else if (output.getOutput().contains("G1 GC is disabled in this release")) {
+    } else if (output.getOutput().contains("-XX:+UseG1GC not supported in this VM")) {
       // G1 is not supported on embedded, ignore such failures.
       output.shouldHaveExitValue(1);
     } else {
       // Normally everything should be fine.
       output.shouldHaveExitValue(0);
< prev index next >