test/compiler/codecache/CheckSegmentedCodeCache.java

*** 1,7 ****
  /*
!  * Copyright (c) 2014, 2015, 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.
--- 1,7 ----
  /*
!  * 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.
*** 50,60 ****
        try {
          // Non-nmethod code heap should be always available with the segmented code cache
          out.shouldContain(NON_METHOD);
        } catch (RuntimeException e) {
          // Check if TieredCompilation is disabled (in a client VM)
!         if(!out.getOutput().contains("TieredCompilation is disabled in this release.")) {
            // Code cache is not segmented
            throw new RuntimeException("No code cache segmentation.");
          }
        }
      } else {
--- 50,60 ----
        try {
          // Non-nmethod code heap should be always available with the segmented code cache
          out.shouldContain(NON_METHOD);
        } catch (RuntimeException e) {
          // Check if TieredCompilation is disabled (in a client VM)
!         if(!out.getOutput().contains("-XX:+TieredCompilation not supported in this VM")) {
            // Code cache is not segmented
            throw new RuntimeException("No code cache segmentation.");
          }
        }
      } else {