| Index: base/test/gtest_util.h
|
| diff --git a/base/test/gtest_util.h b/base/test/gtest_util.h
|
| index 569e39bc4db8258f029396c519526ed1d7f79ff5..4b3151b4b0c73f449ce9a808f53f7b25c91221d3 100644
|
| --- a/base/test/gtest_util.h
|
| +++ b/base/test/gtest_util.h
|
| @@ -21,7 +21,8 @@
|
| // happen and as such executing the statement results in undefined behavior
|
| // (|statement| is compiled in unsupported configurations nonetheless).
|
| // Death tests misbehave on Android.
|
| -#if DCHECK_IS_ON() && defined(GTEST_HAS_DEATH_TEST) && !defined(OS_ANDROID)
|
| +#if DCHECK_IS_ON() && defined(GTEST_HAS_DEATH_TEST) && !defined(OS_ANDROID) && \
|
| + !defined(DCHECK_IS_DUMP_WITHOUT_CRASH)
|
|
|
| // EXPECT/ASSERT_DCHECK_DEATH tests verify that a DCHECK is hit ("Check failed"
|
| // is part of the error message), but intentionally do not expose the gtest
|
|
|