summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authoryurys <yurys@chromium.org>2014-10-01 00:55:23 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-01 07:56:02 +0000
commitda0493f1ee142e6724a1407450d3c1f7f5c7e176 (patch)
tree04c05601062fd09c4bb795208b7a0c2a28583c09 /content
parentc9e499ed9ecf90352c57e85811869c70a9bce7cc (diff)
downloadchromium_src-da0493f1ee142e6724a1407450d3c1f7f5c7e176.zip
chromium_src-da0493f1ee142e6724a1407450d3c1f7f5c7e176.tar.gz
chromium_src-da0493f1ee142e6724a1407450d3c1f7f5c7e176.tar.bz2
DevTools: consider part of the test path starting at LayoutTests/ when configuring test runner
This fixes layout test failures after Blink r183031. The test path may contain folders with the same names as under LayoutTests which may confuse the test runner. BUG=None NOTRY=True Review URL: https://codereview.chromium.org/613963003 Cr-Commit-Position: refs/heads/master@{#297609}
Diffstat (limited to 'content')
-rw-r--r--content/shell/renderer/test_runner/test_interfaces.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/content/shell/renderer/test_runner/test_interfaces.cc b/content/shell/renderer/test_runner/test_interfaces.cc
index 4289fb4..5f62c15 100644
--- a/content/shell/renderer/test_runner/test_interfaces.cc
+++ b/content/shell/renderer/test_runner/test_interfaces.cc
@@ -103,6 +103,9 @@ void TestInterfaces::SetTestIsRunning(bool running) {
void TestInterfaces::ConfigureForTestWithURL(const blink::WebURL& test_url,
bool generate_pixels) {
std::string spec = GURL(test_url).spec();
+ size_t path_start = spec.rfind("LayoutTests/");
+ if (path_start != std::string::npos)
+ spec = spec.substr(path_start);
test_runner_->setShouldGeneratePixelResults(generate_pixels);
if (spec.find("loading/") != std::string::npos)
test_runner_->setShouldDumpFrameLoadCallbacks(true);