summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rw-r--r--tools/valgrind/gtest_exclude/remoting_unittests.gtest-drmemory_win32.txt6
-rw-r--r--tools/valgrind/gtest_exclude/remoting_unittests.gtest-tsan.txt6
-rw-r--r--tools/valgrind/gtest_exclude/remoting_unittests.gtest-tsan_win32.txt6
3 files changed, 6 insertions, 12 deletions
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 25a2ba5..a21737c 100644
--- a/tools/valgrind/gtest_exclude/remoting_unittests.gtest-drmemory_win32.txt
+++ b/tools/valgrind/gtest_exclude/remoting_unittests.gtest-drmemory_win32.txt
@@ -1,10 +1,8 @@
# Following tests create real libjingle connections, and libjingle has
# hardcoded timeouts, so these tests fail under TSan.
JingleSessionTest.Connect
-JingleSessionTest.TestControlChannel
-JingleSessionTest.TestEventChannel
-JingleSessionTest.TestVideoChannel
-JingleSessionTest.TestVideoRtpChannel
+JingleSessionTest.TestUdpChannel
+JingleSessionTest.TestTcpChannel
JingleSessionTest.TestSpeed
# This test fails on an assertion, see http://crbug.com/57266
diff --git a/tools/valgrind/gtest_exclude/remoting_unittests.gtest-tsan.txt b/tools/valgrind/gtest_exclude/remoting_unittests.gtest-tsan.txt
index d7ec34f..af33ac1 100644
--- a/tools/valgrind/gtest_exclude/remoting_unittests.gtest-tsan.txt
+++ b/tools/valgrind/gtest_exclude/remoting_unittests.gtest-tsan.txt
@@ -2,8 +2,6 @@
# hardcoded timeouts, so these tests fail under TSan.
JingleSessionTest.Connect
JingleSessionTest.ConnectBadChannelAuth
-JingleSessionTest.TestControlChannel
-JingleSessionTest.TestEventChannel
+JingleSessionTest.TestUdpChannel
+JingleSessionTest.TestTcpChannel
JingleSessionTest.TestSpeed
-JingleSessionTest.TestVideoChannel
-JingleSessionTest.TestVideoRtpChannel
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 744a1e3..118c299 100644
--- a/tools/valgrind/gtest_exclude/remoting_unittests.gtest-tsan_win32.txt
+++ b/tools/valgrind/gtest_exclude/remoting_unittests.gtest-tsan_win32.txt
@@ -1,8 +1,6 @@
# Following tests create real libjingle connections, and libjingle has
# hardcoded timeouts, so these tests fail under TSan.
JingleSessionTest.Connect
-JingleSessionTest.TestControlChannel
-JingleSessionTest.TestEventChannel
-JingleSessionTest.TestVideoChannel
-JingleSessionTest.TestVideoRtpChannel
+JingleSessionTest.TestUdpChannel
+JingleSessionTest.TestTcpChannel
JingleSessionTest.TestSpeed