commit 1bfc7e5ebf22aac51019937849499f3d7f389db0
author Treehugger Robot <treehugger-gerrit@google.com> Fri Apr 22 00:59:59 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Apr 22 00:59:59 2016 +0000
tree 86cc7ff6e15d316be62f9621d4f34e1ebc1eb07f
parent 436759cc1196c47f999ecc736e69949ccc7e0301
parent b6795157fd010375ca646ea95e972b616b4aeeaf

Merge "ART: Disable unstarted runtime pow test for valgrind"

runtime/interpreter/unstarted_runtime_test.cc

diff --git a/runtime/interpreter/unstarted_runtime_test.cc b/runtime/interpreter/unstarted_runtime_test.cc
index b26635c..814b001 100644
--- a/runtime/interpreter/unstarted_runtime_test.cc
+++ b/runtime/interpreter/unstarted_runtime_test.cc
@@ -20,6 +20,7 @@
 #include <locale>
 
 #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, 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);