commit 41526614ede83bd0c13b71458c852d6c3bda683f
author Andreas Gampe <agampe@google.com> Mon Jan 23 22:48:15 2017 -0800
committer Andreas Gampe <agampe@google.com> Mon Jan 23 23:12:31 2017 -0800
tree ee82df5d381d01468564c5c8b769fe1d069c4b9b
parent b02ff84b89eac187cb6450e9e1991c9c8ab359a1

ART: More rework of test 912

Ensure that the JIT finished compiling before enabling events.
Also run and join a thread before the test.

Bug: 31684920
Test: m ART_TEST_JIT=true ART_TEST_RUN_TEST_RELOCATE_NO_PATCHOAT=true test-art-host-run-test-912-classes
Change-Id: I86ce3820923fb6d68a5cb2ccc971fca16fe5e35f

test/912-classes/src/Main.java

diff --git a/test/912-classes/src/Main.java b/test/912-classes/src/Main.java
index 62dc9f9..6ad23a4 100644
--- a/test/912-classes/src/Main.java
+++ b/test/912-classes/src/Main.java
@@ -232,6 +232,12 @@
       }
     };
 
+    Thread dummyThread = new Thread();
+    dummyThread.start();
+    dummyThread.join();
+
+    ensureJitCompiled(Main.class, "testClassEvents");
+
     enableClassLoadEvents(true);
 
     ClassLoader cl1 = create(boot, DEX1, DEX2);
@@ -331,6 +337,8 @@
 
   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.
   }