Commit c3d07759 authored by phoglund's avatar phoglund Committed by Commit bot

Pointing AppRTC browser test to new location.

Depends on https://codereview.chromium.org/907433002/.

BUG=455758
TESTED=Removed the webrtc-samples directory, applied
https://codereview.chromium.org/900403002, compiled and
then ran:
out/Release/browser_tests --run-manual --gtest_filter=WebRtcApprtcBrowserTest.MANUAL_WorksOnApprtc
on Linux.

Review URL: https://codereview.chromium.org/902133002

Cr-Commit-Position: refs/heads/master@{#315015}
parent 1f79abe7
...@@ -27,8 +27,8 @@ const char kAdviseOnGclientSolution[] = ...@@ -27,8 +27,8 @@ const char kAdviseOnGclientSolution[] =
"You need to add this solution to your .gclient to run this test:\n" "You need to add this solution to your .gclient to run this test:\n"
"{\n" "{\n"
" \"name\" : \"webrtc.DEPS\",\n" " \"name\" : \"webrtc.DEPS\",\n"
" \"url\" : \"svn://svn.chromium.org/chrome/trunk/deps/" " \"url\" : \"https://chromium.googlesource.com/chromium/deps/"
"third_party/webrtc/webrtc.DEPS\",\n" "webrtc/webrtc.DEPS\",\n"
"}"; "}";
const char kTitlePageOfAppEngineAdminPage[] = "Instances"; const char kTitlePageOfAppEngineAdminPage[] = "Instances";
...@@ -86,13 +86,19 @@ class WebRtcApprtcBrowserTest : public WebRtcTestBase { ...@@ -86,13 +86,19 @@ class WebRtcApprtcBrowserTest : public WebRtcTestBase {
} }
base::FilePath apprtc_dir = base::FilePath apprtc_dir =
GetSourceDir().Append(FILE_PATH_LITERAL( GetSourceDir().Append(FILE_PATH_LITERAL("out/apprtc/out/app_engine"));
"out/webrtc-samples/samples/web/content/apprtc"));
if (!base::PathExists(apprtc_dir)) { if (!base::PathExists(apprtc_dir)) {
LOG(ERROR) << "Missing AppRTC code at " << LOG(ERROR) << "Missing AppRTC AppEngine app at " <<
apprtc_dir.value() << ". " << kAdviseOnGclientSolution; apprtc_dir.value() << ". " << kAdviseOnGclientSolution;
return false; return false;
} }
if (!base::PathExists(apprtc_dir.Append(FILE_PATH_LITERAL("app.yaml")))) {
LOG(ERROR) << "The AppRTC AppEngine app at " <<
apprtc_dir.value() << " appears to have not been built." <<
"This should have been done by webrtc.DEPS scripts which invoke " <<
"'grunt build' on AppRTC.";
return false;
}
base::CommandLine command_line(base::CommandLine::NO_PROGRAM); base::CommandLine command_line(base::CommandLine::NO_PROGRAM);
EXPECT_TRUE(GetPythonCommand(&command_line)); EXPECT_TRUE(GetPythonCommand(&command_line));
......
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