zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add Fuchsia filesystem specific handling

Browse Source 
This unlocks many tests, at least locally.

Bug: b/232740856
Change-Id: Icd8d099aabf6f81906d7c6b3b40f47b501496c6b
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/284141
Reviewed-by: Andrey Logvin <landrey@webrtc.org>
Commit-Queue: Christoffer Jansson <jansson@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#38695}
This commit is contained in:
Christoffer Jansson
2022-11-18 16:50:35 +01:00
committed by WebRTC LUCI CQ
parent 538fa81328
commit 987ebe6b49
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
test/testsupport/file_utils_override.cc
View File

@ -69,7 +69,10 @@ const absl::string_view kPathDelimiter = "/";
const absl::string_view kAndroidChromiumTestsRoot = const absl::string_view kAndroidChromiumTestsRoot =
"/sdcard/chromium_tests_root/"; "/sdcard/chromium_tests_root/";
#endif #endif
#if defined(WEBRTC_FUCHSIA)
const absl::string_view kFuchsiaTestRoot = "/pkg/";
const absl::string_view kFuchsiaTempWritableDir = "/tmp/";
#endif
#if !defined(WEBRTC_IOS) #if !defined(WEBRTC_IOS)
const absl::string_view kResourcesDirName = "resources"; const absl::string_view kResourcesDirName = "resources";
#endif #endif
@ -91,6 +94,11 @@ absl::optional<std::string> ProjectRootPath() {
// the test is bundled (which our tests are not), in which case it's 5 levels. // the test is bundled (which our tests are not), in which case it's 5 levels.
return DirName(DirName(exe_dir)) + std::string(kPathDelimiter); return DirName(DirName(exe_dir)) + std::string(kPathDelimiter);
#elif defined(WEBRTC_POSIX) #elif defined(WEBRTC_POSIX)
// Fuchsia uses POSIX defines as well but does not have full POSIX
// functionality.
#if defined(WEBRTC_FUCHSIA)
return std::string(kFuchsiaTestRoot);
#else
char buf[PATH_MAX]; char buf[PATH_MAX];
ssize_t count = ::readlink("/proc/self/exe", buf, arraysize(buf)); ssize_t count = ::readlink("/proc/self/exe", buf, arraysize(buf));
if (count <= 0) { if (count <= 0) {
@ -100,6 +108,7 @@ absl::optional<std::string> ProjectRootPath() {
// On POSIX, tests execute in out/Whatever, so src is two levels up. // On POSIX, tests execute in out/Whatever, so src is two levels up.
std::string exe_dir = DirName(absl::string_view(buf, count)); std::string exe_dir = DirName(absl::string_view(buf, count));
return DirName(DirName(exe_dir)) + std::string(kPathDelimiter); return DirName(DirName(exe_dir)) + std::string(kPathDelimiter);
#endif
#elif defined(WEBRTC_WIN) #elif defined(WEBRTC_WIN)
wchar_t buf[MAX_PATH]; wchar_t buf[MAX_PATH];
buf[0] = 0; buf[0] = 0;
@ -117,6 +126,8 @@ std::string OutputPath() {
return IOSOutputPath(); return IOSOutputPath();
#elif defined(WEBRTC_ANDROID) #elif defined(WEBRTC_ANDROID)
return std::string(kAndroidChromiumTestsRoot); return std::string(kAndroidChromiumTestsRoot);
#elif defined(WEBRTC_FUCHSIA)
return std::string(kFuchsiaTempWritableDir);
#else #else
absl::optional<std::string> path_opt = ProjectRootPath(); absl::optional<std::string> path_opt = ProjectRootPath();
RTC_DCHECK(path_opt); RTC_DCHECK(path_opt);