commit fded02c164ea4cc3d28d7f30ac9ce9d94d76ef7a
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

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

webrtc/base/filelock_unittest.cc

diff --git a/webrtc/base/filelock_unittest.cc b/webrtc/base/filelock_unittest.cc
index eecbf07..536204e 100644
--- a/webrtc/base/filelock_unittest.cc
+++ b/webrtc/base/filelock_unittest.cc
@@ -17,6 +17,7 @@
 #include "webrtc/base/pathutils.h"
 #include "webrtc/base/scoped_ptr.h"
 #include "webrtc/base/thread.h"
+#include "webrtc/test/testsupport/gtest_disable.h"
 
 namespace rtc {
 
@@ -76,7 +77,7 @@
   EXPECT_TRUE(lock2.get() == NULL);
 }
 
-TEST_F(FileLockTest, TestThreadedLock) {
+TEST_F(FileLockTest, DISABLED_ON_MAC(TestThreadedLock)) {
   scoped_ptr<FileLock> lock(FileLock::TryLock(temp_file_.pathname()));
   EXPECT_TRUE(lock.get() != NULL);