commit 5dcf19d402b4ea7023ced2afa8d615576fe2784f
author Yi Kong <yikong@google.com> Mon Apr 04 17:44:59 2016 +0100
committer Yi Kong <yikong@google.com> Wed Apr 06 16:50:46 2016 +0000
tree 6266158f027410b9b16a4ecf53d8df16e1459ecb
parent eb98c0ded592cfca8187c744393c82efd1020b2a

Fix and re-enable compiler_driver_test

This reverts commit 6f58cb85328bed2f3ea246cce4080244544d7c2b.

The move to OpenJDK introduces new dependencies to compile these
methods, however we don't actually need them to run this test. Remove
them here to enable the test again.

Bug: 25836016
Change-Id: I75b12c48941fca6646142004accae8364e8c6dbc

compiler/driver/compiler_driver_test.cc

diff --git a/compiler/driver/compiler_driver_test.cc b/compiler/driver/compiler_driver_test.cc
index 0037564..053f1f4 100644
--- a/compiler/driver/compiler_driver_test.cc
+++ b/compiler/driver/compiler_driver_test.cc
@@ -143,21 +143,13 @@
   // TODO: check that all Method::GetCode() values are non-null
 }
 
-TEST_F(CompilerDriverTest, DISABLED_AbstractMethodErrorStub) {
+TEST_F(CompilerDriverTest, AbstractMethodErrorStub) {
   TEST_DISABLED_FOR_HEAP_REFERENCE_POISONING_WITH_QUICK();
   TEST_DISABLED_FOR_READ_BARRIER_WITH_QUICK();
   TEST_DISABLED_FOR_READ_BARRIER_WITH_OPTIMIZING_FOR_UNSUPPORTED_INSTRUCTION_SETS();
   jobject class_loader;
   {
     ScopedObjectAccess soa(Thread::Current());
-    CompileVirtualMethod(ScopedNullHandle<mirror::ClassLoader>(),
-                         "java.lang.Class",
-                         "isFinalizable",
-                         "()Z");
-    CompileDirectMethod(ScopedNullHandle<mirror::ClassLoader>(),
-                        "java.lang.Object",
-                        "<init>",
-                        "()V");
     class_loader = LoadDex("AbstractMethod");
   }
   ASSERT_TRUE(class_loader != nullptr);