From 5dcf19d402b4ea7023ced2afa8d615576fe2784f Mon Sep 17 00:00:00 2001 From: Yi Kong Date: Mon, 4 Apr 2016 17:44:59 +0100 Subject: 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 | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'compiler/driver/compiler_driver_test.cc') diff --git a/compiler/driver/compiler_driver_test.cc b/compiler/driver/compiler_driver_test.cc index 00375641f3..053f1f4bf5 100644 --- a/compiler/driver/compiler_driver_test.cc +++ b/compiler/driver/compiler_driver_test.cc @@ -143,21 +143,13 @@ TEST_F(CompilerDriverTest, DISABLED_LARGE_CompileDexLibCore) { // 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(), - "java.lang.Class", - "isFinalizable", - "()Z"); - CompileDirectMethod(ScopedNullHandle(), - "java.lang.Object", - "", - "()V"); class_loader = LoadDex("AbstractMethod"); } ASSERT_TRUE(class_loader != nullptr); -- cgit v1.2.3-59-g8ed1b