| commit | fded02c164ea4cc3d28d7f30ac9ce9d94d76ef7a | [log] [tgz] |
|---|---|---|
| author | henrike@webrtc.org <henrike@webrtc.org> | Fri Sep 19 13:10:10 2014 +0000 |
| committer | henrike@webrtc.org <henrike@webrtc.org> | Fri Sep 19 13:10:10 2014 +0000 |
| tree | 3c98ca7c2c27f980def46299a6f32416357fa0b2 | |
| parent | bbe0a8517d7f9da7aa779bff77cdbb70df358437 [diff] [blame] |
base: disabled several base tests on Mac so that rtc_unittests can be turned back on BUG=N/A R=kjellander@webrtc.org Review URL: https://webrtc-codereview.appspot.com/30449004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@7240 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/webrtc/base/nullsocketserver_unittest.cc b/webrtc/base/nullsocketserver_unittest.cc index fe21f6a..6d3eb52 100644 --- a/webrtc/base/nullsocketserver_unittest.cc +++ b/webrtc/base/nullsocketserver_unittest.cc
@@ -10,6 +10,7 @@ #include "webrtc/base/gunit.h" #include "webrtc/base/nullsocketserver.h" +#include "webrtc/test/testsupport/gtest_disable.h" namespace rtc { @@ -27,7 +28,7 @@ NullSocketServer ss_; }; -TEST_F(NullSocketServerTest, WaitAndSet) { +TEST_F(NullSocketServerTest, DISABLED_ON_MAC(WaitAndSet)) { Thread thread; EXPECT_TRUE(thread.Start()); thread.Post(this, 0);