diff options
| author | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-04 19:02:38 +0000 |
|---|---|---|
| committer | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-04 19:02:38 +0000 |
| commit | 8c3881ab86792f0b7cfa1daf1684fd74b5ccc351 (patch) | |
| tree | 6852098e831227ae65d38d0d688a390196e98029 /base/message_pump_libevent_unittest.cc | |
| parent | feec6e53ae52868d989243d35fe9a2bc007affde (diff) | |
| download | chromium_src-8c3881ab86792f0b7cfa1daf1684fd74b5ccc351.zip chromium_src-8c3881ab86792f0b7cfa1daf1684fd74b5ccc351.tar.gz chromium_src-8c3881ab86792f0b7cfa1daf1684fd74b5ccc351.tar.bz2 | |
Enable ThreadChecker in non-debug builds if DCHECK_ALWAYS_ON is
defined.
This brings thread checking to e.g. the *_rel trybots.
BUG=108227
Review URL: http://codereview.chromium.org/9020008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116350 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/message_pump_libevent_unittest.cc')
| -rw-r--r-- | base/message_pump_libevent_unittest.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/base/message_pump_libevent_unittest.cc b/base/message_pump_libevent_unittest.cc index 9ec78de..c3ec97e 100644 --- a/base/message_pump_libevent_unittest.cc +++ b/base/message_pump_libevent_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -59,7 +59,7 @@ class StupidWatcher : public MessagePumpLibevent::Watcher { virtual void OnFileCanWriteWithoutBlocking(int fd) {} }; -#if GTEST_HAS_DEATH_TEST +#if GTEST_HAS_DEATH_TEST && !defined(NDEBUG) // Test to make sure that we catch calling WatchFileDescriptor off of the // wrong thread. @@ -67,13 +67,13 @@ TEST_F(MessagePumpLibeventTest, TestWatchingFromBadThread) { MessagePumpLibevent::FileDescriptorWatcher watcher; StupidWatcher delegate; - ASSERT_DEBUG_DEATH(io_loop()->WatchFileDescriptor( + ASSERT_DEATH(io_loop()->WatchFileDescriptor( STDOUT_FILENO, false, MessageLoopForIO::WATCH_READ, &watcher, &delegate), "Check failed: " "watch_file_descriptor_caller_checker_.CalledOnValidThread()"); } -#endif // GTEST_HAS_DEATH_TEST +#endif // GTEST_HAS_DEATH_TEST && !defined(NDEBUG) class DeleteWatcher : public MessagePumpLibevent::Watcher { public: |