diff options
| author | kmackay <kmackay@chromium.org> | 2016-02-26 20:20:42 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-02-27 04:22:12 +0000 |
| commit | b2924d32875d90757fa0666f076490b88b82f9c3 (patch) | |
| tree | 375d61476a5ce3db682c3dc0ea8253081102cc9e /chromecast | |
| parent | 5bbc487ef9a375236c2b8ca9196d34c60d767323 (diff) | |
| download | chromium_src-b2924d32875d90757fa0666f076490b88b82f9c3.zip chromium_src-b2924d32875d90757fa0666f076490b88b82f9c3.tar.gz chromium_src-b2924d32875d90757fa0666f076490b88b82f9c3.tar.bz2 | |
[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}
Diffstat (limited to 'chromecast')
| -rw-r--r-- | chromecast/base/component/component_unittest.cc | 3 |
1 files changed, 3 insertions, 0 deletions
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<ComponentC> { 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<ComponentA> a(new ComponentA()); |