1.1 --- a/test/compiler/whitebox/DeoptimizeAllTest.java Thu Dec 26 21:00:23 2013 -0800 1.2 +++ b/test/compiler/whitebox/DeoptimizeAllTest.java Tue Dec 31 19:26:57 2013 +0400 1.3 @@ -27,19 +27,17 @@ 1.4 * @library /testlibrary /testlibrary/whitebox 1.5 * @build DeoptimizeAllTest 1.6 * @run main ClassFileInstaller sun.hotspot.WhiteBox 1.7 - * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:CompileCommand=compileonly,TestCase$Helper::* DeoptimizeAllTest 1.8 + * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:CompileCommand=compileonly,SimpleTestCase$Helper::* DeoptimizeAllTest 1.9 * @summary testing of WB::deoptimizeAll() 1.10 * @author igor.ignatyev@oracle.com 1.11 */ 1.12 public class DeoptimizeAllTest extends CompilerWhiteBoxTest { 1.13 1.14 public static void main(String[] args) throws Exception { 1.15 - for (TestCase test : TestCase.values()) { 1.16 - new DeoptimizeAllTest(test).runTest(); 1.17 - } 1.18 + CompilerWhiteBoxTest.main(DeoptimizeAllTest::new, args); 1.19 } 1.20 1.21 - public DeoptimizeAllTest(TestCase testCase) { 1.22 + private DeoptimizeAllTest(TestCase testCase) { 1.23 super(testCase); 1.24 // to prevent inlining of #method 1.25 WHITE_BOX.testSetDontInlineMethod(method, true); 1.26 @@ -53,7 +51,7 @@ 1.27 */ 1.28 @Override 1.29 protected void test() throws Exception { 1.30 - if (testCase.isOsr && CompilerWhiteBoxTest.MODE.startsWith( 1.31 + if (testCase.isOsr() && CompilerWhiteBoxTest.MODE.startsWith( 1.32 "compiled ")) { 1.33 System.err.printf("Warning: %s is not applicable in %s%n", 1.34 testCase.name(), CompilerWhiteBoxTest.MODE);