diff test/compiler/tiered/NonTieredLevelsTest.java @ 14909:4ca6dc0799b6

Backout jdk9 merge
author Gilles Duboscq <duboscq@ssw.jku.at>
date Tue, 01 Apr 2014 13:57:07 +0200
parents f9a4b59ae350
children 52b4284cb496
line wrap: on
line diff
--- a/test/compiler/tiered/NonTieredLevelsTest.java	Tue Apr 01 14:09:03 2014 +0200
+++ b/test/compiler/tiered/NonTieredLevelsTest.java	Tue Apr 01 13:57:07 2014 +0200
@@ -30,7 +30,7 @@
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
  * @run main/othervm -Xbootclasspath/a:. -XX:-TieredCompilation
  *                   -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
- *                   -XX:CompileCommand=compileonly,SimpleTestCase$Helper::*
+ *                   -XX:CompileCommand=compileonly,TestCase$Helper::*
  *                   NonTieredLevelsTest
  * @summary Verify that only one level can be used
  * @author igor.ignatyev@oracle.com
@@ -59,7 +59,9 @@
                     + "TieredCompilation. Skip test.");
             return;
         }
-        CompilerWhiteBoxTest.main(NonTieredLevelsTest::new, args);
+        for (TestCase test : TestCase.values()) {
+            new NonTieredLevelsTest(test).runTest();
+        }
     }
 
     private NonTieredLevelsTest(TestCase testCase) {
@@ -78,7 +80,7 @@
         checkLevel(AVAILABLE_COMP_LEVEL, compLevel);
         int bci = WHITE_BOX.getMethodEntryBci(method);
         deoptimize();
-        if (!testCase.isOsr()) {
+        if (!testCase.isOsr) {
             for (int level = 1; level <= COMP_LEVEL_MAX; ++level) {
                 if (IS_AVAILABLE_COMPLEVEL.test(level)) {
                     testAvailableLevel(level, bci);
@@ -92,4 +94,3 @@
         }
     }
 }
-