1.1 --- a/test/compiler/tiered/NonTieredLevelsTest.java Thu Dec 26 21:00:23 2013 -0800
1.2 +++ b/test/compiler/tiered/NonTieredLevelsTest.java Tue Dec 31 19:26:57 2013 +0400
1.3 @@ -30,7 +30,7 @@
1.4 * @run main ClassFileInstaller sun.hotspot.WhiteBox
1.5 * @run main/othervm -Xbootclasspath/a:. -XX:-TieredCompilation
1.6 * -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
1.7 - * -XX:CompileCommand=compileonly,TestCase$Helper::*
1.8 + * -XX:CompileCommand=compileonly,SimpleTestCase$Helper::*
1.9 * NonTieredLevelsTest
1.10 * @summary Verify that only one level can be used
1.11 * @author igor.ignatyev@oracle.com
1.12 @@ -59,9 +59,7 @@
1.13 + "TieredCompilation. Skip test.");
1.14 return;
1.15 }
1.16 - for (TestCase test : TestCase.values()) {
1.17 - new NonTieredLevelsTest(test).runTest();
1.18 - }
1.19 + CompilerWhiteBoxTest.main(NonTieredLevelsTest::new, args);
1.20 }
1.21
1.22 private NonTieredLevelsTest(TestCase testCase) {
1.23 @@ -80,7 +78,7 @@
1.24 checkLevel(AVAILABLE_COMP_LEVEL, compLevel);
1.25 int bci = WHITE_BOX.getMethodEntryBci(method);
1.26 deoptimize();
1.27 - if (!testCase.isOsr) {
1.28 + if (!testCase.isOsr()) {
1.29 for (int level = 1; level <= COMP_LEVEL_MAX; ++level) {
1.30 if (IS_AVAILABLE_COMPLEVEL.test(level)) {
1.31 testAvailableLevel(level, bci);
1.32 @@ -94,3 +92,4 @@
1.33 }
1.34 }
1.35 }
1.36 +
