diff options
author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-26 00:01:38 +0000 |
---|---|---|
committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-26 00:01:38 +0000 |
commit | f4a13ccc511e224e125d0cdfb0198b6075fee681 (patch) | |
tree | 008ec0e69bc3962895538838666dfd5e22913425 | |
parent | 068b349d9cce2380026810fe532b5345b3769bb4 (diff) | |
download | chromium_src-f4a13ccc511e224e125d0cdfb0198b6075fee681.zip chromium_src-f4a13ccc511e224e125d0cdfb0198b6075fee681.tar.gz chromium_src-f4a13ccc511e224e125d0cdfb0198b6075fee681.tar.bz2 |
Remove TSan supporessions on windows for remoting_unittests.
BUG=57832
TEST=None
Review URL: http://codereview.chromium.org/3606014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63809 0039d316-1c4b-4281-b951-d872f2087c98
5 files changed, 17 insertions, 28 deletions
diff --git a/remoting/protocol/jingle_chromoting_connection_unittest.cc b/remoting/protocol/jingle_chromoting_connection_unittest.cc index abd00f9..66a24b9 100644 --- a/remoting/protocol/jingle_chromoting_connection_unittest.cc +++ b/remoting/protocol/jingle_chromoting_connection_unittest.cc @@ -164,10 +164,12 @@ class JingleChromotingConnectionTest : public testing::Test { NewCallback(&client_connection_callback_, &MockConnectionCallback::OnStateChange)); - host_connected_event.TimedWait(base::TimeDelta::FromMilliseconds( - TestTimeouts::action_max_timeout_ms())); - client_connected_event.TimedWait(base::TimeDelta::FromMilliseconds( - TestTimeouts::action_max_timeout_ms())); + ASSERT_TRUE( + host_connected_event.TimedWait(base::TimeDelta::FromMilliseconds( + TestTimeouts::action_max_timeout_ms()))); + ASSERT_TRUE( + client_connected_event.TimedWait(base::TimeDelta::FromMilliseconds( + TestTimeouts::action_max_timeout_ms()))); } static void SignalEvent(base::WaitableEvent* event) { @@ -223,8 +225,9 @@ class ChannelTesterBase : public base::RefCountedThreadSafe<ChannelTesterBase> { } void WaitFinished() { - done_event_.TimedWait(base::TimeDelta::FromMilliseconds( - TestTimeouts::action_max_timeout_ms())); + ASSERT_TRUE( + done_event_.TimedWait(base::TimeDelta::FromMilliseconds( + TestTimeouts::action_max_timeout_ms()))); } virtual void CheckResults() = 0; @@ -532,8 +535,9 @@ TEST_F(JingleChromotingConnectionTest, RejectConnection) { NewCallback(&client_connection_callback_, &MockConnectionCallback::OnStateChange)); - done_event.TimedWait( - base::TimeDelta::FromMilliseconds(TestTimeouts::action_max_timeout_ms())); + ASSERT_TRUE( + done_event.TimedWait(base::TimeDelta::FromMilliseconds( + TestTimeouts::action_max_timeout_ms()))); } // Verify that we can connect two endpoints. diff --git a/tools/valgrind/chrome_tests.py b/tools/valgrind/chrome_tests.py index a9c71db..47337ee 100755 --- a/tools/valgrind/chrome_tests.py +++ b/tools/valgrind/chrome_tests.py @@ -232,7 +232,11 @@ class ChromeTests: return self.SimpleTest("chrome", "printing_unittests") def TestRemoting(self): - return self.SimpleTest("chrome", "remoting_unittests") + return self.SimpleTest("chrome", "remoting_unittests", + cmd_args=[ + "--ui-test-timeout=240000", + "--ui-test-action-timeout=120000", + "--ui-test-action-max-timeout=280000"]) def TestIpc(self): return self.SimpleTest("ipc", "ipc_tests", diff --git a/tools/valgrind/gtest_exclude/remoting_unittests.gtest-drmemory_win32.txt b/tools/valgrind/gtest_exclude/remoting_unittests.gtest-drmemory_win32.txt index 9ba3024..e69de29 100644 --- a/tools/valgrind/gtest_exclude/remoting_unittests.gtest-drmemory_win32.txt +++ b/tools/valgrind/gtest_exclude/remoting_unittests.gtest-drmemory_win32.txt @@ -1,6 +0,0 @@ -# These tests fail under Dr. Memory; see http://crbug.com/57832 -JingleChromotingConnectionTest.TestVideoChannel -JingleChromotingConnectionTest.TestVideoRtpChannel - -# Data race, detectable by Dr. Memory; see http://crbug.com/60536 -JingleChromotingConnectionTest.TestEventChannel diff --git a/tools/valgrind/gtest_exclude/remoting_unittests.gtest-tsan_win32.txt b/tools/valgrind/gtest_exclude/remoting_unittests.gtest-tsan_win32.txt index 035246d..e69de29 100644 --- a/tools/valgrind/gtest_exclude/remoting_unittests.gtest-tsan_win32.txt +++ b/tools/valgrind/gtest_exclude/remoting_unittests.gtest-tsan_win32.txt @@ -1,6 +0,0 @@ -# Fail under TSan, see http://crbug.com/57832 -JingleChromotingConnectionTest.TestVideoChannel -JingleChromotingConnectionTest.TestVideoRtpChannel - -# Fails under TSan, see http://crbug.com/60536 -JingleChromotingConnectionTest.TestEventChannel diff --git a/tools/valgrind/tsan/suppressions.txt b/tools/valgrind/tsan/suppressions.txt index f001012..8d567e6 100644 --- a/tools/valgrind/tsan/suppressions.txt +++ b/tools/valgrind/tsan/suppressions.txt @@ -55,13 +55,6 @@ fun:ThreadSanitizerStartThread } -{ - bug_60536 - ThreadSanitizer:Race - fun:*net::GrowableIOBuffer* - fun:remoting::TCPChannelTester::* -} - ############################ # Real races in third_party { |