Index: webrtc/test/testsupport/fileutils_unittest.cc |
diff --git a/webrtc/test/testsupport/fileutils_unittest.cc b/webrtc/test/testsupport/fileutils_unittest.cc |
index 5e36c35f77cc5732196dc8f2b5b5737f0fa0d8af..f7ddb1539bf40b643a1c5d070de598c3792ee669 100644 |
--- a/webrtc/test/testsupport/fileutils_unittest.cc |
+++ b/webrtc/test/testsupport/fileutils_unittest.cc |
@@ -58,7 +58,7 @@ std::string FileUtilsTest::original_working_dir_ = ""; |
// directory that is automatically set when the test executable is launched. |
// The test is not fully testing the implementation, since we cannot be sure |
// of where the executable was launched from. |
-#if defined(WEBRTC_ANDROID) |
+#if defined(WEBRTC_ANDROID) || defined(WEBRTC_IOS) |
#define MAYBE_OutputPathFromUnchangedWorkingDir \ |
DISABLED_OutputPathFromUnchangedWorkingDir |
#else |
@@ -74,7 +74,7 @@ TEST_F(FileUtilsTest, MAYBE_OutputPathFromUnchangedWorkingDir) { |
// Tests with current working directory set to a directory higher up in the |
// directory tree than the project root dir. |
-#if defined(WEBRTC_ANDROID) || defined(WIN32) |
+#if defined(WEBRTC_ANDROID) || defined(WIN32) || defined(WEBRTC_IOS) |
#define MAYBE_OutputPathFromRootWorkingDir DISABLED_OutputPathFromRootWorkingDir |
#else |
#define MAYBE_OutputPathFromRootWorkingDir OutputPathFromRootWorkingDir |
@@ -93,7 +93,12 @@ TEST_F(FileUtilsTest, TempFilename) { |
} |
// Only tests that the code executes |
-TEST_F(FileUtilsTest, CreateDir) { |
+#if defined(WEBRTC_IOS) |
+#define MAYBE_CreateDir DISABLED_CreateDir |
+#else |
+#define MAYBE_CreateDir CreateDir |
+#endif |
+TEST_F(FileUtilsTest, MAYBE_CreateDir) { |
std::string directory = "fileutils-unittest-empty-dir"; |
// Make sure it's removed if a previous test has failed: |
remove(directory.c_str()); |
@@ -121,7 +126,9 @@ TEST_F(FileUtilsTest, ResourcePathReturnsValue) { |
TEST_F(FileUtilsTest, ResourcePathFromRootWorkingDir) { |
ASSERT_EQ(0, chdir(kPathDelimiter)); |
std::string resource = webrtc::test::ResourcePath(kTestName, kExtension); |
+#if !defined(WEBRTC_IOS) |
ASSERT_NE(resource.find("resources"), std::string::npos); |
+#endif |
ASSERT_GT(resource.find(kTestName), 0u); |
ASSERT_GT(resource.find(kExtension), 0u); |
} |