Commit 0e7fd3e5 authored by Mirko Bonadei's avatar Mirko Bonadei Committed by Commit Bot

Change resource folder to workaround Windows MAX_PATH.

Example of failure: https://ci.chromium.org/p/chromium/builders/webrtc.fyi/WebRTC%20Chromium%20FYI%20Win%20Builder/4011

Bug: 997673
Change-Id: I25453b2750346e5ee460d76dc4ead6555de11fad
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1785218Reviewed-by: default avatarNico Weber <thakis@chromium.org>
Reviewed-by: default avatarMirko Bonadei <mbonadei@chromium.org>
Commit-Queue: Mirko Bonadei <mbonadei@chromium.org>
Cr-Commit-Position: refs/heads/master@{#693369}
parent 68835c80
...@@ -69,10 +69,9 @@ class WebRtcApprtcBrowserTest : public WebRtcTestBase { ...@@ -69,10 +69,9 @@ class WebRtcApprtcBrowserTest : public WebRtcTestBase {
protected: protected:
bool LaunchApprtcInstanceOnLocalhost(const std::string& port) { bool LaunchApprtcInstanceOnLocalhost(const std::string& port) {
base::FilePath appengine_dev_appserver = base::FilePath appengine_dev_appserver = GetSourceDir().Append(
GetSourceDir().Append(FILE_PATH_LITERAL( FILE_PATH_LITERAL("third_party/webrtc/rtc_tools/testing/browsertest/"
"third_party/webrtc/rtc_tools/testing/webrtc_apprtc_browsertest/" "apprtc/temp/google-cloud-sdk/bin/dev_appserver.py"));
"apprtc/temp/google-cloud-sdk/bin/dev_appserver.py"));
if (!base::PathExists(appengine_dev_appserver)) { if (!base::PathExists(appengine_dev_appserver)) {
LOG(ERROR) << "Missing appengine sdk at " << LOG(ERROR) << "Missing appengine sdk at " <<
appengine_dev_appserver.value() << ".\n" << appengine_dev_appserver.value() << ".\n" <<
...@@ -82,7 +81,7 @@ class WebRtcApprtcBrowserTest : public WebRtcTestBase { ...@@ -82,7 +81,7 @@ class WebRtcApprtcBrowserTest : public WebRtcTestBase {
base::FilePath apprtc_dir = GetSourceDir().Append( base::FilePath apprtc_dir = GetSourceDir().Append(
FILE_PATH_LITERAL("third_party/webrtc/rtc_tools/testing/" FILE_PATH_LITERAL("third_party/webrtc/rtc_tools/testing/"
"webrtc_apprtc_browsertest/apprtc/out/app_engine")); "browsertest/apprtc/out/app_engine"));
if (!base::PathExists(apprtc_dir)) { if (!base::PathExists(apprtc_dir)) {
LOG(ERROR) << "Missing AppRTC AppEngine app at " << LOG(ERROR) << "Missing AppRTC AppEngine app at " <<
apprtc_dir.value() << ".\n" << test::kAdviseOnGclientSolution; apprtc_dir.value() << ".\n" << test::kAdviseOnGclientSolution;
...@@ -115,13 +114,13 @@ class WebRtcApprtcBrowserTest : public WebRtcTestBase { ...@@ -115,13 +114,13 @@ class WebRtcApprtcBrowserTest : public WebRtcTestBase {
// The go workspace should be created, and collidermain built, at the // The go workspace should be created, and collidermain built, at the
// runhooks stage when webrtc.DEPS/build_apprtc_collider.py runs. // runhooks stage when webrtc.DEPS/build_apprtc_collider.py runs.
#if defined(OS_WIN) #if defined(OS_WIN)
base::FilePath collider_server = GetSourceDir().Append(FILE_PATH_LITERAL( base::FilePath collider_server = GetSourceDir().Append(
"third_party/webrtc/rtc_tools/testing/" FILE_PATH_LITERAL("third_party/webrtc/rtc_tools/testing/"
"webrtc_apprtc_browsertest/collider/collidermain.exe")); "browsertest/collider/collidermain.exe"));
#else #else
base::FilePath collider_server = GetSourceDir().Append( base::FilePath collider_server = GetSourceDir().Append(
FILE_PATH_LITERAL("third_party/webrtc/rtc_tools/testing/" FILE_PATH_LITERAL("third_party/webrtc/rtc_tools/testing/"
"webrtc_apprtc_browsertest/collider/collidermain")); "browsertest/collider/collidermain"));
#endif #endif
if (!base::PathExists(collider_server)) { if (!base::PathExists(collider_server)) {
LOG(ERROR) << "Missing Collider server binary at " << LOG(ERROR) << "Missing Collider server binary at " <<
......
...@@ -2617,9 +2617,9 @@ if (is_linux || is_mac || is_win) { ...@@ -2617,9 +2617,9 @@ if (is_linux || is_mac || is_win) {
":browser_tests", ":browser_tests",
] ]
data = [ data = [
"//third_party/webrtc/rtc_tools/testing/webrtc_apprtc_browsertest/apprtc/out/app_engine/", "//third_party/webrtc/rtc_tools/testing/browsertest/apprtc/out/app_engine/",
"//third_party/webrtc/rtc_tools/testing/webrtc_apprtc_browsertest/apprtc/temp/google-cloud-sdk/", "//third_party/webrtc/rtc_tools/testing/browsertest/apprtc/temp/google-cloud-sdk/",
"//third_party/webrtc/rtc_tools/testing/webrtc_apprtc_browsertest/collider/", "//third_party/webrtc/rtc_tools/testing/browsertest/collider/",
] ]
if (is_win) { if (is_win) {
write_runtime_deps = "$root_out_dir/$target_name.exe.runtime_deps" write_runtime_deps = "$root_out_dir/$target_name.exe.runtime_deps"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment