summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordpranke@google.com <dpranke@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-30 23:12:17 +0000
committerdpranke@google.com <dpranke@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-30 23:12:17 +0000
commita7215f5d4723b74a071cfe9d2f827392a2ce9022 (patch)
treea0ca94bdaaedeaa0e74082a8376abe4e41e024c3
parent54ab47445701ab383f4fdb820cb95714366d5955 (diff)
downloadchromium_src-a7215f5d4723b74a071cfe9d2f827392a2ce9022.zip
chromium_src-a7215f5d4723b74a071cfe9d2f827392a2ce9022.tar.gz
chromium_src-a7215f5d4723b74a071cfe9d2f827392a2ce9022.tar.bz2
Fix issue #23442 - when test shell is run in layout test mode and a URL is
passed in on the command line (which happens when running under Purify using --run-singly), the URL is canonicalized and echoed back into the output. The net result of this is that if we passed in a file:///c:/ URL with a lower case drive letter, the output gets echoed back with an upper case drive letter (file:///C:/). The test harness checks the output URL against the input URL to make sure we're getting the output we expect, and in this case it bails out (incorrectly). To fix this, we change test_shell to echo out the URL as passed in. BUG=http://crbug.com/23442 TEST=none R=darin@chromium.org Review URL: http://codereview.chromium.org/249045 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27681 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--webkit/tools/test_shell/test_shell_main.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/webkit/tools/test_shell/test_shell_main.cc b/webkit/tools/test_shell/test_shell_main.cc
index 951b87d..783f7aa 100644
--- a/webkit/tools/test_shell/test_shell_main.cc
+++ b/webkit/tools/test_shell/test_shell_main.cc
@@ -321,7 +321,7 @@ int main(int argc, char* argv[]) {
} else {
// TODO(ojan): Provide a way for run-singly tests to pass
// in a hash and then set params.pixel_hash here.
- params.test_url = starting_url.spec();
+ params.test_url = WideToUTF8(loose_values[0]);
TestShell::RunFileTest(params);
}