commit 79c3e4e558215ffae1601fc6d5f1626e063a4b22
author Treehugger Robot <treehugger-gerrit@google.com> Thu Sep 01 03:21:22 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Sep 01 03:21:23 2016 +0000
tree 7d1d44eb4a153ed738178abf8e3948a103ca3429
parent b2ca72ab1e2ee16291657ed855404a01a3cda3ee
parent 0f7eaebb1622e08482c519fe5eaab9afa8f64df1

Merge "Disable dexlayout_test on target."

dexlayout/dexlayout_test.cc

diff --git a/dexlayout/dexlayout_test.cc b/dexlayout/dexlayout_test.cc
index 1757548..42b64c3 100644
--- a/dexlayout/dexlayout_test.cc
+++ b/dexlayout/dexlayout_test.cc
@@ -72,6 +72,8 @@
 
 
 TEST_F(DexLayoutTest, FullPlainOutput) {
+  // Disable test on target.
+  TEST_DISABLED_FOR_TARGET();
   std::string error_msg;
   ASSERT_TRUE(Exec(&error_msg)) << error_msg;
 }

runtime/common_runtime_test.h

diff --git a/runtime/common_runtime_test.h b/runtime/common_runtime_test.h
index d99c6ae..c07c03e 100644
--- a/runtime/common_runtime_test.h
+++ b/runtime/common_runtime_test.h
@@ -195,6 +195,12 @@
   DISALLOW_COPY_AND_ASSIGN(CheckJniAbortCatcher);
 };
 
+#define TEST_DISABLED_FOR_TARGET() \
+  if (kIsTargetBuild) { \
+    printf("WARNING: TEST DISABLED FOR TARGET\n"); \
+    return; \
+  }
+
 #define TEST_DISABLED_FOR_MIPS() \
   if (kRuntimeISA == kMips) { \
     printf("WARNING: TEST DISABLED FOR MIPS\n"); \