From 59eabd3c7b1ea533decb267a4f06785124e0208d Mon Sep 17 00:00:00 2001 From: jbudorick Date: Thu, 19 May 2016 08:08:09 -0700 Subject: [PATCH] [Android] Disable death check in BindingCallbackTest.DeleteCallbackBeforeBindingDeathTest. The Android bot this previously ran on, Android GN, did release builds without DCHECK_ALWAYS_ON, so the death check was being skipped anyway. BUG=610839 Review-Url: https://codereview.chromium.org/1991233002 Cr-Commit-Position: refs/heads/master@{#394770} --- mojo/public/cpp/bindings/tests/binding_callback_unittest.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mojo/public/cpp/bindings/tests/binding_callback_unittest.cc b/mojo/public/cpp/bindings/tests/binding_callback_unittest.cc index 34a28b775bd72..e6bdfa9a59d9c 100644 --- a/mojo/public/cpp/bindings/tests/binding_callback_unittest.cc +++ b/mojo/public/cpp/bindings/tests/binding_callback_unittest.cc @@ -334,7 +334,7 @@ TEST_F(BindingCallbackTest, DeleteCallbackBeforeBindingDeathTest) { EXPECT_EQ(7, server_impl.last_server_value_seen()); EXPECT_EQ(0, last_client_callback_value_seen_); -#if !defined(NDEBUG) || defined(DCHECK_ALWAYS_ON) +#if (!defined(NDEBUG) || defined(DCHECK_ALWAYS_ON)) && !defined(OS_ANDROID) // Delete the callback without running it. This should cause a crash in debug // builds due to a DCHECK. std::string regex("Check failed: !is_valid"); @@ -343,7 +343,8 @@ TEST_F(BindingCallbackTest, DeleteCallbackBeforeBindingDeathTest) { regex.clear(); #endif // OS_WIN EXPECT_DEATH_IF_SUPPORTED(server_impl.DeleteCallback(), regex.c_str()); -#endif // !defined(NDEBUG) || defined(DCHECK_ALWAYS_ON) +#endif // (!defined(NDEBUG) || defined(DCHECK_ALWAYS_ON)) && + // !defined(OS_ANDROID) } } // namespace