From: Andreas Gampe Date: Fri, 22 Apr 2016 00:23:31 +0000 (-0700) Subject: ART: Disable unstarted runtime pow test for valgrind X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b6795157fd010375ca646ea95e972b616b4aeeaf;p=android-x86%2Fart.git ART: Disable unstarted runtime pow test for valgrind Valgrind seems to give the wrong result. Disable test for now. Change-Id: I2b136abc107b53d89b70ccb20dd378a7b704d077 --- diff --git a/runtime/interpreter/unstarted_runtime_test.cc b/runtime/interpreter/unstarted_runtime_test.cc index b26635c85..814b0018f 100644 --- a/runtime/interpreter/unstarted_runtime_test.cc +++ b/runtime/interpreter/unstarted_runtime_test.cc @@ -20,6 +20,7 @@ #include #include "base/casts.h" +#include "base/memory_tool.h" #include "class_linker.h" #include "common_runtime_test.h" #include "dex_instruction.h" @@ -841,6 +842,11 @@ TEST_F(UnstartedRuntimeTest, Cos) { } TEST_F(UnstartedRuntimeTest, Pow) { + // Valgrind seems to get this wrong, actually. Disable for valgrind. + if (RUNNING_ON_MEMORY_TOOL != 0 && kMemoryToolIsValgrind) { + return; + } + Thread* self = Thread::Current(); ScopedObjectAccess soa(self);