From b2924d32875d90757fa0666f076490b88b82f9c3 Mon Sep 17 00:00:00 2001 From: kmackay Date: Fri, 26 Feb 2016 20:20:42 -0800 Subject: [Chromecast] Don't run death tests when DCHECK is disabled BUG= internal b/27364008 Review URL: https://codereview.chromium.org/1740263003 Cr-Commit-Position: refs/heads/master@{#378114} --- chromecast/base/component/component_unittest.cc | 3 +++ 1 file changed, 3 insertions(+) (limited to 'chromecast') diff --git a/chromecast/base/component/component_unittest.cc b/chromecast/base/component/component_unittest.cc index ec55dd5..b3835b5 100644 --- a/chromecast/base/component/component_unittest.cc +++ b/chromecast/base/component/component_unittest.cc @@ -153,6 +153,7 @@ class ComponentC : public Component { ComponentB::Dependency b_; }; +#if (!defined(NDEBUG) || defined(DCHECK_ALWAYS_ON)) && GTEST_HAS_DEATH_TEST TEST_F(ComponentDeathTest, SelfDependency) { ::testing::FLAGS_gtest_death_test_style = "threadsafe"; ComponentA a; @@ -174,6 +175,8 @@ TEST_F(ComponentDeathTest, TransitiveCircularDependency) { EXPECT_DEATH(a.MakeTransitiveCircularDependency(c.GetRef()), "Circular dependency"); } +#endif // (!defined(NDEBUG) || defined(DCHECK_ALWAYS_ON)) && + // GTEST_HAS_DEATH_TEST TEST_F(ComponentTest, SimpleEnable) { scoped_ptr a(new ComponentA()); -- cgit v1.1