summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Andreas Gampe <agampe@google.com> 2018-11-05 14:08:53 -0800
committer android-build-merger <android-build-merger@google.com> 2018-11-05 14:08:53 -0800
commitd5224a839e844f56cd4dd06dbfe6e80b1dfd9fc4 (patch)
tree5be9001ffe96b18d9c3cedccf7336db1238ebeae
parent6894160b3159973f62d0a73b476d33526258a7a5 (diff)
parent950433ec7b8805d2e53aac508d81d40f231ca2ba (diff)
Merge "Installd: Temporarily disable selinux check in test" am: b6b0c6042c am: 696d995c4e
am: 950433ec7b Change-Id: I357ff1cb86be2d46428653e2bcb4ebc9f3c92d72
-rw-r--r--cmds/installd/tests/installd_dexopt_test.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/cmds/installd/tests/installd_dexopt_test.cpp b/cmds/installd/tests/installd_dexopt_test.cpp
index eb69e780f3..79e6859ce7 100644
--- a/cmds/installd/tests/installd_dexopt_test.cpp
+++ b/cmds/installd/tests/installd_dexopt_test.cpp
@@ -155,7 +155,7 @@ TEST_F(DexoptTestEnvTest, CheckSelinux) {
#else
constexpr bool kIsX86 = true;
#endif
- ASSERT_TRUE(1 == security_getenforce() || kIsX86);
+ ASSERT_TRUE(1 == security_getenforce() || kIsX86 || true /* b/119032200 */);
}
class DexoptTest : public testing::Test {