From 97bce58ed923b5abc6f0a2d681ccfcfa36daa19e Mon Sep 17 00:00:00 2001 From: Donald E Curtis Date: Tue, 19 May 2015 13:18:00 -0700 Subject: [PATCH] Disable the EXPECT_DEATH check in bitbuffer on Android BUG=4364 R=noahric@chromium.org, pthatcher@webrtc.org Review URL: https://webrtc-codereview.appspot.com/46349004 Cr-Commit-Position: refs/heads/master@{#9226} --- webrtc/base/bitbuffer_unittest.cc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/webrtc/base/bitbuffer_unittest.cc b/webrtc/base/bitbuffer_unittest.cc index 21cffd67a3..89d3524677 100644 --- a/webrtc/base/bitbuffer_unittest.cc +++ b/webrtc/base/bitbuffer_unittest.cc @@ -164,8 +164,12 @@ TEST(BitBufferTest, SetOffsetValues) { EXPECT_EQ(0u, bit_offset); EXPECT_FALSE(buffer.Seek(4, 1)); + // Disable death test on Android because it relies on fork() and doesn't play + // nicely. +#if !defined(WEBRTC_ANDROID) // Passing a NULL out parameter is death. EXPECT_DEATH(buffer.GetCurrentOffset(&byte_offset, NULL), ""); +#endif } uint64 GolombEncoded(uint32 val) {