1.1 --- a/test/compiler/tiered/TieredLevelsTest.java Sun Mar 31 16:57:21 2019 -0700
1.2 +++ b/test/compiler/tiered/TieredLevelsTest.java Mon Jun 03 16:14:54 2019 +0100
1.3 @@ -34,16 +34,14 @@
1.4 * @author igor.ignatyev@oracle.com
1.5 */
1.6 public class TieredLevelsTest extends CompLevelsTest {
1.7 - public static void main(String[] args) throws Exception {
1.8 - if (!TIERED_COMPILATION) {
1.9 - System.err.println("Test isn't applicable w/ disabled "
1.10 - + "TieredCompilation. Skip test.");
1.11 + public static void main(String[] args) throws Exception, Throwable {
1.12 + if (CompilerWhiteBoxTest.skipOnTieredCompilation(false)) {
1.13 return;
1.14 }
1.15 CompilerWhiteBoxTest.main(TieredLevelsTest::new, args);
1.16 }
1.17
1.18 - private TieredLevelsTest(TestCase testCase) {
1.19 + protected TieredLevelsTest(TestCase testCase) {
1.20 super(testCase);
1.21 // to prevent inlining of #method
1.22 WHITE_BOX.testSetDontInlineMethod(method, true);
1.23 @@ -76,14 +74,18 @@
1.24 }
1.25 }
1.26
1.27 -
1.28 @Override
1.29 protected void checkLevel(int expected, int actual) {
1.30 if (expected == COMP_LEVEL_FULL_PROFILE
1.31 && actual == COMP_LEVEL_LIMITED_PROFILE) {
1.32 // for simple method full_profile may be replaced by limited_profile
1.33 + if (IS_VERBOSE) {
1.34 + System.out.printf("Level check: full profiling was replaced "
1.35 + + "by limited profiling. Expected: %d, actual:%d",
1.36 + expected, actual);
1.37 + }
1.38 return;
1.39 }
1.40 super.checkLevel(expected, actual);
1.41 - }
1.42 + }
1.43 }
