8302203: IR framework should detect non-compilable test methods early

Reviewed-by: chagedorn, kvn
openjdk · Feb 13, 2023 · d1c87a0 · d1c87a0 · openjdk-notifier · Feb 13, 2023
1 parent 1fec6b5
commit d1c87a0
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/test/AbstractTest.java b/test/hotspot/jtreg/compiler/lib/ir_framework/test/AbstractTest.java
@@ -116,12 +116,6 @@ protected void onStart() {
 
     protected void compileMethod(DeclaredTest test) {
         final Method testMethod = test.getTestMethod();
-        TestRun.check(WHITE_BOX.isMethodCompilable(testMethod, test.getCompLevel().getValue(), false),
-                      "Method " + testMethod + " not compilable at level " + test.getCompLevel()
-                      + ". Did you use compileonly without including all @Test methods?");
-        TestRun.check(WHITE_BOX.isMethodCompilable(testMethod),
-                      "Method " + testMethod + " not compilable at level " + test.getCompLevel()
-                      + ". Did you use compileonly without including all @Test methods?");
         if (TestFramework.VERBOSE) {
             System.out.println("Compile method " + testMethod + " after warm-up...");
         }
@@ -163,7 +157,10 @@ protected void compileMethod(DeclaredTest test) {
     }
 
     private void enqueueMethodForCompilation(DeclaredTest test) {
-        TestVM.enqueueForCompilation(test.getTestMethod(), test.getCompLevel());
+        final Method testMethod = test.getTestMethod();
+        TestRun.check(WHITE_BOX.isMethodCompilable(testMethod, test.getCompLevel().getValue(), false),
+                      "Method " + testMethod + " not compilable (anymore) at level " + test.getCompLevel());
+        TestVM.enqueueForCompilation(testMethod, test.getCompLevel());
     }
 
     protected void checkCompilationLevel(DeclaredTest test) {