Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(185)

Unified Diff: webrtc/test/testsupport/fileutils.cc

Issue 1694353003: iOS: Add resource files for tests and implement OutputPath (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Fix ifdef for Android build Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/modules/video_coding/test/tester_main.cc ('k') | webrtc/test/testsupport/iosfileutils.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/test/testsupport/fileutils.cc
diff --git a/webrtc/test/testsupport/fileutils.cc b/webrtc/test/testsupport/fileutils.cc
index 4ff0034dea178de23fd21bd79da31e0963395d45..2fab425a3166430ca76a1d8fc98bdbd11ce3c147 100644
--- a/webrtc/test/testsupport/fileutils.cc
+++ b/webrtc/test/testsupport/fileutils.cc
@@ -43,6 +43,7 @@ namespace test {
#if defined(WEBRTC_IOS)
// Defined in iosfileutils.mm. No header file to discourage use elsewhere.
+std::string IOSOutputPath();
std::string IOSResourcePath(std::string name, std::string extension);
#endif
@@ -59,9 +60,12 @@ const char* kRootDirName = "/sdcard/";
#else
// The file we're looking for to identify the project root dir.
const char* kProjectRootFileName = "DEPS";
+#if !defined(WEBRTC_IOS)
const char* kOutputDirName = "out";
-const char* kFallbackPath = "./";
#endif
+const char* kFallbackPath = "./";
+#endif // !defined(WEBRTC_ANDROID)
+
#if !defined(WEBRTC_IOS)
const char* kResourcesDirName = "resources";
#endif
@@ -140,6 +144,9 @@ std::string ProjectRootPath() {
}
std::string OutputPath() {
+#if defined(WEBRTC_IOS)
+ return IOSOutputPath();
+#else
std::string path = ProjectRootPath();
if (path == kCannotFindProjectRootDir) {
return kFallbackPath;
@@ -149,6 +156,7 @@ std::string OutputPath() {
return kFallbackPath;
}
return path + kPathDelimiter;
+#endif
}
std::string WorkingDir() {
« no previous file with comments | « webrtc/modules/video_coding/test/tester_main.cc ('k') | webrtc/test/testsupport/iosfileutils.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698