Merge "ART: More rework of test 912"

1 files changed, 8 insertions, 0 deletions

diff --git a/test/912-classes/src/Main.java b/test/912-classes/src/Main.java
index 62dc9f9e5c..6ad23a4869 100644
--- a/test/912-classes/src/Main.java
+++ b/test/912-classes/src/Main.java
@@ -232,6 +232,12 @@ public class Main {
       }
     };
 
+    Thread dummyThread = new Thread();
+    dummyThread.start();
+    dummyThread.join();
+
+    ensureJitCompiled(Main.class, "testClassEvents");
+
     enableClassLoadEvents(true);
 
     ClassLoader cl1 = create(boot, DEX1, DEX2);
@@ -331,6 +337,8 @@ public class Main {
 
   private static native void enableClassLoadEvents(boolean b);
 
+  private static native void ensureJitCompiled(Class c, String name);
+
   private static class TestForNonInit {
     public static double dummy = Math.random();  // So it can't be compile-time initialized.
   }