projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upstream version 10.39.225.0
[platform/framework/web/crosswalk.git]
/
src
/
third_party
/
webrtc
/
base
/
filelock_unittest.cc
diff --git
a/src/third_party/webrtc/base/filelock_unittest.cc
b/src/third_party/webrtc/base/filelock_unittest.cc
index
eecbf07
..
536204e
100644
(file)
--- a/
src/third_party/webrtc/base/filelock_unittest.cc
+++ b/
src/third_party/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/base/pathutils.h"
#include "webrtc/base/scoped_ptr.h"
#include "webrtc/base/thread.h"
+#include "webrtc/test/testsupport/gtest_disable.h"
namespace rtc {
namespace rtc {
@@
-76,7
+77,7
@@
TEST_F(FileLockTest, TestLockX2) {
EXPECT_TRUE(lock2.get() == NULL);
}
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);
scoped_ptr<FileLock> lock(FileLock::TryLock(temp_file_.pathname()));
EXPECT_TRUE(lock.get() != NULL);