Mercurial > jdk8-mips64-public > hotspot / changeset

     1.1 --- a/test/compiler/tiered/NonTieredLevelsTest.java	Tue Mar 11 16:05:36 2014 -0700
     1.2 +++ b/test/compiler/tiered/NonTieredLevelsTest.java	Thu Mar 06 12:47:45 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 @@ -70,6 +70,9 @@
    1.11  
    1.12      @Override
    1.13      protected void test() throws Exception {
    1.14 +        if (skipXcompOSR()) {
    1.15 +          return;
    1.16 +        }
    1.17          checkNotCompiled();
    1.18          compile();
    1.19          checkCompiled();

     2.1 --- a/test/compiler/tiered/TieredLevelsTest.java	Tue Mar 11 16:05:36 2014 -0700
     2.2 +++ b/test/compiler/tiered/TieredLevelsTest.java	Thu Mar 06 12:47:45 2014 +0400
     2.3 @@ -1,5 +1,5 @@
     2.4  /*
     2.5 - * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
     2.6 + * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
     2.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     2.8   *
     2.9   * This code is free software; you can redistribute it and/or modify it
    2.10 @@ -51,6 +51,9 @@
    2.11  
    2.12      @Override
    2.13      protected void test() throws Exception {
    2.14 +        if (skipXcompOSR()) {
    2.15 +          return;
    2.16 +        }
    2.17          checkNotCompiled();
    2.18          compile();
    2.19          checkCompiled();

     3.1 --- a/test/compiler/whitebox/CompilerWhiteBoxTest.java	Tue Mar 11 16:05:36 2014 -0700
     3.2 +++ b/test/compiler/whitebox/CompilerWhiteBoxTest.java	Thu Mar 06 12:47:45 2014 +0400
     3.3 @@ -1,5 +1,5 @@
     3.4  /*
     3.5 - * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
     3.6 + * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
     3.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     3.8   *
     3.9   * This code is free software; you can redistribute it and/or modify it
    3.10 @@ -380,6 +380,20 @@
    3.11          /** flag for OSR test case */
    3.12          boolean isOsr();
    3.13      }
    3.14 +
    3.15 +    /**
    3.16 +     * @return {@code true} if the current test case is OSR and the mode is
    3.17 +     *          Xcomp, otherwise {@code false}
    3.18 +     */
    3.19 +    protected boolean skipXcompOSR() {
    3.20 +        boolean result =  testCase.isOsr()
    3.21 +                && CompilerWhiteBoxTest.MODE.startsWith("compiled ");
    3.22 +        if (result && IS_VERBOSE) {
    3.23 +            System.err.printf("Warning: %s is not applicable in %s%n",
    3.24 +                    testCase.name(), CompilerWhiteBoxTest.MODE);
    3.25 +        }
    3.26 +        return result;
    3.27 +    }
    3.28  }
    3.29  
    3.30  enum SimpleTestCase implements CompilerWhiteBoxTest.TestCase {

     4.1 --- a/test/compiler/whitebox/DeoptimizeAllTest.java	Tue Mar 11 16:05:36 2014 -0700
     4.2 +++ b/test/compiler/whitebox/DeoptimizeAllTest.java	Thu Mar 06 12:47:45 2014 +0400
     4.3 @@ -1,5 +1,5 @@
     4.4  /*
     4.5 - * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
     4.6 + * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
     4.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     4.8   *
     4.9   * This code is free software; you can redistribute it and/or modify it
    4.10 @@ -51,11 +51,8 @@
    4.11       */
    4.12      @Override
    4.13      protected void test() throws Exception {
    4.14 -        if (testCase.isOsr() && CompilerWhiteBoxTest.MODE.startsWith(
    4.15 -                "compiled ")) {
    4.16 -          System.err.printf("Warning: %s is not applicable in %s%n",
    4.17 -                testCase.name(), CompilerWhiteBoxTest.MODE);
    4.18 -          return;
    4.19 +        if (skipXcompOSR()) {
    4.20 +            return;
    4.21          }
    4.22          compile();
    4.23          checkCompiled();

     5.1 --- a/test/compiler/whitebox/DeoptimizeMethodTest.java	Tue Mar 11 16:05:36 2014 -0700
     5.2 +++ b/test/compiler/whitebox/DeoptimizeMethodTest.java	Thu Mar 06 12:47:45 2014 +0400
     5.3 @@ -1,5 +1,5 @@
     5.4  /*
     5.5 - * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
     5.6 + * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
     5.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     5.8   *
     5.9   * This code is free software; you can redistribute it and/or modify it
    5.10 @@ -51,11 +51,8 @@
    5.11       */
    5.12      @Override
    5.13      protected void test() throws Exception {
    5.14 -        if (testCase.isOsr() && CompilerWhiteBoxTest.MODE.startsWith(
    5.15 -                "compiled ")) {
    5.16 -          System.err.printf("Warning: %s is not applicable in %s%n",
    5.17 -                testCase.name(), CompilerWhiteBoxTest.MODE);
    5.18 -          return;
    5.19 +        if (skipXcompOSR()) {
    5.20 +            return;
    5.21          }
    5.22          compile();
    5.23          checkCompiled();

     6.1 --- a/test/compiler/whitebox/IsMethodCompilableTest.java	Tue Mar 11 16:05:36 2014 -0700
     6.2 +++ b/test/compiler/whitebox/IsMethodCompilableTest.java	Thu Mar 06 12:47:45 2014 +0400
     6.3 @@ -1,5 +1,5 @@
     6.4  /*
     6.5 - * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
     6.6 + * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
     6.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     6.8   *
     6.9   * This code is free software; you can redistribute it and/or modify it
    6.10 @@ -66,10 +66,7 @@
    6.11       */
    6.12      @Override
    6.13      protected void test() throws Exception {
    6.14 -        if (testCase.isOsr() && CompilerWhiteBoxTest.MODE.startsWith(
    6.15 -                "compiled ")) {
    6.16 -          System.err.printf("Warning: %s is not applicable in %s%n",
    6.17 -                testCase.name(), CompilerWhiteBoxTest.MODE);
    6.18 +        if (skipXcompOSR()) {
    6.19            return;
    6.20          }
    6.21          if (!isCompilable()) {

     7.1 --- a/test/compiler/whitebox/MakeMethodNotCompilableTest.java	Tue Mar 11 16:05:36 2014 -0700
     7.2 +++ b/test/compiler/whitebox/MakeMethodNotCompilableTest.java	Thu Mar 06 12:47:45 2014 +0400
     7.3 @@ -1,5 +1,5 @@
     7.4  /*
     7.5 - * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
     7.6 + * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
     7.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     7.8   *
     7.9   * This code is free software; you can redistribute it and/or modify it
    7.10 @@ -53,11 +53,8 @@
    7.11       */
    7.12      @Override
    7.13      protected void test() throws Exception {
    7.14 -        if (testCase.isOsr() && CompilerWhiteBoxTest.MODE.startsWith(
    7.15 -                "compiled ")) {
    7.16 -          System.err.printf("Warning: %s is not applicable in %s%n",
    7.17 -                testCase.name(), CompilerWhiteBoxTest.MODE);
    7.18 -          return;
    7.19 +        if (skipXcompOSR()) {
    7.20 +            return;
    7.21          }
    7.22          checkNotCompiled();
    7.23          if (!isCompilable()) {