Index: webrtc/base/fileutils_unittest.cc |
diff --git a/webrtc/base/fileutils_unittest.cc b/webrtc/base/fileutils_unittest.cc |
index 51396caefbbe000945368e0419223d2b7ec35327..756f511f7a94c7b6d8ebb63d0def7ade2aa4d470 100644 |
--- a/webrtc/base/fileutils_unittest.cc |
+++ b/webrtc/base/fileutils_unittest.cc |
@@ -17,14 +17,21 @@ |
namespace rtc { |
+#if defined (WEBRTC_ANDROID) |
+// Fails on Android: https://bugs.chromium.org/p/webrtc/issues/detail?id=4364. |
+#define MAYBE_FilesystemTest DISABLED_FilesystemTest |
+#else |
+#define MAYBE_FilesystemTest FilesystemTest |
+#endif |
+ |
// Make sure we can get a temp folder for the later tests. |
-TEST(FilesystemTest, GetTemporaryFolder) { |
+TEST(MAYBE_FilesystemTest, GetTemporaryFolder) { |
Pathname path; |
EXPECT_TRUE(Filesystem::GetTemporaryFolder(path, true, NULL)); |
} |
// Test creating a temp file, reading it back in, and deleting it. |
-TEST(FilesystemTest, TestOpenFile) { |
+TEST(MAYBE_FilesystemTest, TestOpenFile) { |
Pathname path; |
EXPECT_TRUE(Filesystem::GetTemporaryFolder(path, true, NULL)); |
path.SetPathname(Filesystem::TempFilename(path, "ut")); |
@@ -52,7 +59,7 @@ TEST(FilesystemTest, TestOpenFile) { |
} |
// Test opening a non-existent file. |
-TEST(FilesystemTest, TestOpenBadFile) { |
+TEST(MAYBE_FilesystemTest, TestOpenBadFile) { |
Pathname path; |
EXPECT_TRUE(Filesystem::GetTemporaryFolder(path, true, NULL)); |
path.SetFilename("not an actual file"); |
@@ -65,7 +72,7 @@ TEST(FilesystemTest, TestOpenBadFile) { |
// Test that CreatePrivateFile fails for existing files and succeeds for |
// non-existent ones. |
-TEST(FilesystemTest, TestCreatePrivateFile) { |
+TEST(MAYBE_FilesystemTest, TestCreatePrivateFile) { |
Pathname path; |
EXPECT_TRUE(Filesystem::GetTemporaryFolder(path, true, NULL)); |
path.SetFilename("private_file_test"); |
@@ -86,7 +93,7 @@ TEST(FilesystemTest, TestCreatePrivateFile) { |
} |
// Test checking for free disk space. |
-TEST(FilesystemTest, TestGetDiskFreeSpace) { |
+TEST(MAYBE_FilesystemTest, TestGetDiskFreeSpace) { |
// Note that we should avoid picking any file/folder which could be located |
// at the remotely mounted drive/device. |
Pathname path; |
@@ -119,12 +126,12 @@ TEST(FilesystemTest, TestGetDiskFreeSpace) { |
} |
// Tests that GetCurrentDirectory() returns something. |
-TEST(FilesystemTest, TestGetCurrentDirectory) { |
+TEST(MAYBE_FilesystemTest, TestGetCurrentDirectory) { |
EXPECT_FALSE(Filesystem::GetCurrentDirectory().empty()); |
} |
// Tests that GetAppPathname returns something. |
-TEST(FilesystemTest, TestGetAppPathname) { |
+TEST(MAYBE_FilesystemTest, TestGetAppPathname) { |
Pathname path; |
EXPECT_TRUE(Filesystem::GetAppPathname(&path)); |
EXPECT_FALSE(path.empty()); |