Skip to content

Commit

Permalink
[Android] Disable death check in BindingCallbackTest.DeleteCallbackBe…
Browse files Browse the repository at this point in the history
…foreBindingDeathTest.

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}
  • Loading branch information
jbudorick authored and Commit bot committed May 19, 2016
1 parent ffa1344 commit 59eabd3
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions mojo/public/cpp/bindings/tests/binding_callback_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand All @@ -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
Expand Down

0 comments on commit 59eabd3

Please sign in to comment.