test/compiler/arguments/CheckCICompilerCount.java

*** 1,7 ****
  /*
!  * Copyright (c) 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) 2015, 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.
*** 158,168 ****
                  out.shouldContain(expected_output);
              }
          } catch (RuntimeException e) {
              // Check if tiered compilation is available in this JVM
              // Version. Throw exception only if it is available.
!             if (!(tiered && out.getOutput().contains("TieredCompilation is disabled in this release."))) {
                  throw new RuntimeException(e);
              }
          }
      }
  
--- 158,168 ----
                  out.shouldContain(expected_output);
              }
          } catch (RuntimeException e) {
              // Check if tiered compilation is available in this JVM
              // Version. Throw exception only if it is available.
!             if (!(tiered && out.getOutput().contains("-XX:+TieredCompilation not supported in this VM"))) {
                  throw new RuntimeException(e);
              }
          }
      }