generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

base/thread_unittest: wrap test was setting current thread to NULL.

Browse Source 
This broke unittests following ThreadTest.Wrap

BUG=3836
R=pbos@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/28689004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7413 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
henrike@webrtc.org 2014-10-09 15:41:40 +00:00
parent 17f8ddd6c4
commit e30dab77df
4 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
webrtc/base/base_tests.gyp
View File

@ -105,7 +105,7 @@
'task_unittest.cc', 'task_unittest.cc',
'testclient_unittest.cc', 'testclient_unittest.cc',
'thread_checker_unittest.cc', 'thread_checker_unittest.cc',
#'thread_unittest.cc', 'thread_unittest.cc',
#'timeutils_unittest.cc', #'timeutils_unittest.cc',
'urlencode_unittest.cc', 'urlencode_unittest.cc',
#'versionparsing_unittest.cc', #'versionparsing_unittest.cc',

4
webrtc/base/thread.h
View File

@ -213,7 +213,8 @@ class Thread : public MessageQueue {
// value. Must be called on this thread. // value. Must be called on this thread.
bool SetAllowBlockingCalls(bool allow); bool SetAllowBlockingCalls(bool allow);
protected: // These functions are public to avoid injecting test hooks. Don't call them
// outside of tests.
// This method should be called when thread is created using non standard // This method should be called when thread is created using non standard
// method, like derived implementation of rtc::Thread and it can not be // method, like derived implementation of rtc::Thread and it can not be
// started by calling Start(). This will set started flag to true and // started by calling Start(). This will set started flag to true and
@ -221,6 +222,7 @@ class Thread : public MessageQueue {
bool WrapCurrent(); bool WrapCurrent();
void UnwrapCurrent(); void UnwrapCurrent();
protected:
// Same as WrapCurrent except that it never fails as it does not try to // Same as WrapCurrent except that it never fails as it does not try to
// acquire the synchronization access of the thread. The caller should never // acquire the synchronization access of the thread. The caller should never
// call Stop() or Join() on this thread. // call Stop() or Join() on this thread.

7
webrtc/base/thread_unittest.cc
View File

@ -247,7 +247,9 @@ TEST(ThreadTest, DISABLED_ON_MAC(Priorities)) {
} }
TEST(ThreadTest, DISABLED_ON_MAC(Wrap)) { TEST(ThreadTest, Wrap) {
Thread* current_thread = Thread::Current();
current_thread->UnwrapCurrent();
CustomThread* cthread = new CustomThread(); CustomThread* cthread = new CustomThread();
EXPECT_TRUE(cthread->WrapCurrent()); EXPECT_TRUE(cthread->WrapCurrent());
EXPECT_TRUE(cthread->RunningForTest()); EXPECT_TRUE(cthread->RunningForTest());
@ -255,6 +257,7 @@ TEST(ThreadTest, DISABLED_ON_MAC(Wrap)) {
cthread->UnwrapCurrent(); cthread->UnwrapCurrent();
EXPECT_FALSE(cthread->RunningForTest()); EXPECT_FALSE(cthread->RunningForTest());
delete cthread; delete cthread;
current_thread->WrapCurrent();
} }
TEST(ThreadTest, DISABLED_ON_MAC(Invoke)) { TEST(ThreadTest, DISABLED_ON_MAC(Invoke)) {
@ -377,7 +380,7 @@ class AsyncInvokeTest : public testing::Test {
Thread* expected_thread_; Thread* expected_thread_;
}; };
TEST_F(AsyncInvokeTest, DISABLED_FireAndForget) { TEST_F(AsyncInvokeTest, FireAndForget) {
AsyncInvoker invoker; AsyncInvoker invoker;
// Create and start the thread. // Create and start the thread.
Thread thread; Thread thread;

7
webrtc/build/tsan_suppressions_webrtc.cc
View File

@ -41,6 +41,13 @@ char kTSanDefaultSuppressions[] =
"race:webrtc/modules/audio_processing/aec/aec_core.c\n" "race:webrtc/modules/audio_processing/aec/aec_core.c\n"
"race:webrtc/modules/audio_processing/aec/aec_rdft.c\n" "race:webrtc/modules/audio_processing/aec/aec_rdft.c\n"
// rtc_unittest
// https://code.google.com/p/webrtc/issues/detail?id=3911 for details.
"race:ThreadTest_ThreeThreadsInvoke_Test::TestBody()::LocalFuncs::SetAndInvokeSet\n"
"race:rtc::FireAndForgetAsyncClosure<FunctorB>::Execute\n"
"race:rtc::MessageQueueManager::Clear\n"
"race:rtc::Thread::Clear\n"
// libjingle_p2p_unittest // libjingle_p2p_unittest
// https://code.google.com/p/webrtc/issues/detail?id=2079 // https://code.google.com/p/webrtc/issues/detail?id=2079
"race:webrtc/base/testclient.cc\n" "race:webrtc/base/testclient.cc\n"