diff options
| author | 2016-09-01 03:21:22 +0000 | |
|---|---|---|
| committer | 2016-09-01 03:21:23 +0000 | |
| commit | 79c3e4e558215ffae1601fc6d5f1626e063a4b22 (patch) | |
| tree | 7d1d44eb4a153ed738178abf8e3948a103ca3429 | |
| parent | b2ca72ab1e2ee16291657ed855404a01a3cda3ee (diff) | |
| parent | 0f7eaebb1622e08482c519fe5eaab9afa8f64df1 (diff) | |
Merge "Disable dexlayout_test on target."
| -rw-r--r-- | dexlayout/dexlayout_test.cc | 2 | ||||
| -rw-r--r-- | runtime/common_runtime_test.h | 6 |
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"); \ |