summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jeff Hao <jeffhao@google.com> 2016-08-31 17:56:13 -0700
committer Jeff Hao <jeffhao@google.com> 2016-09-01 01:29:42 +0000
commit0f7eaebb1622e08482c519fe5eaab9afa8f64df1 (patch)
tree7d1d44eb4a153ed738178abf8e3948a103ca3429
parent244d105f68159b13c55217dd6d883991ba4a7c20 (diff)
Disable dexlayout_test on target.
Target doesn't have diff to compare output files. Bug: 29921113 Test: mm test-art-target-gtest-dexlayout_test Change-Id: I244c0c74214b780676283de1b309978667ff58e3
-rw-r--r--dexlayout/dexlayout_test.cc2
-rw-r--r--runtime/common_runtime_test.h6
2 files changed, 8 insertions, 0 deletions
diff --git a/dexlayout/dexlayout_test.cc b/dexlayout/dexlayout_test.cc
index 175754849d..42b64c3888 100644
--- a/dexlayout/dexlayout_test.cc
+++ b/dexlayout/dexlayout_test.cc
@@ -72,6 +72,8 @@ class DexLayoutTest : public CommonRuntimeTest {
TEST_F(DexLayoutTest, FullPlainOutput) {
+ // Disable test on target.
+ TEST_DISABLED_FOR_TARGET();
std::string error_msg;
ASSERT_TRUE(Exec(&error_msg)) << error_msg;
}
diff --git a/runtime/common_runtime_test.h b/runtime/common_runtime_test.h
index d99c6ae0ea..c07c03e677 100644
--- a/runtime/common_runtime_test.h
+++ b/runtime/common_runtime_test.h
@@ -195,6 +195,12 @@ class CheckJniAbortCatcher {
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"); \