summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authordpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-22 23:25:25 +0000
committerdpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-22 23:25:25 +0000
commitd72b4870298a6f5e10179d757c061cea0f3d23a1 (patch)
tree52ae04b72fcf6fd3093399e9fd5c860c712a43c6 /chrome
parentd2257faa71ff0bd7bb3766af054e4d6c768b03b3 (diff)
downloadchromium_src-d72b4870298a6f5e10179d757c061cea0f3d23a1.zip
chromium_src-d72b4870298a6f5e10179d757c061cea0f3d23a1.tar.gz
chromium_src-d72b4870298a6f5e10179d757c061cea0f3d23a1.tar.bz2
Update various test scripts to use the upstream version of
run-chromium-webkit-tests and rebaseline-chromium-webkit-tests BUG=23099 R=victorw TEST=bots don't explode Review URL: http://codereview.chromium.org/639001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39662 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/test/ui/ui_test.cc18
1 files changed, 10 insertions, 8 deletions
diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc
index 12846c6..13043cf 100644
--- a/chrome/test/ui/ui_test.cc
+++ b/chrome/test/ui/ui_test.cc
@@ -260,12 +260,13 @@ static CommandLine* CreateHttpServerCommandLine() {
PathService::Get(base::DIR_SOURCE_ROOT, &src_path);
FilePath script_path(src_path);
- script_path = script_path.AppendASCII("webkit");
- script_path = script_path.AppendASCII("tools");
- script_path = script_path.AppendASCII("layout_tests");
+ script_path = script_path.AppendASCII("third_party");
+ script_path = script_path.AppendASCII("WebKit");
+ script_path = script_path.AppendASCII("WebKitTools");
+ script_path = script_path.AppendASCII("Scripts");
script_path = script_path.AppendASCII("webkitpy");
script_path = script_path.AppendASCII("layout_tests");
- script_path = script_path.AppendASCII("layout_package");
+ script_path = script_path.AppendASCII("port");
script_path = script_path.AppendASCII("http_server.py");
CommandLine* cmd_line = CreatePythonCommandLine();
@@ -279,12 +280,13 @@ static CommandLine* CreateWebSocketServerCommandLine() {
PathService::Get(base::DIR_SOURCE_ROOT, &src_path);
FilePath script_path(src_path);
- script_path = script_path.AppendASCII("webkit");
- script_path = script_path.AppendASCII("tools");
- script_path = script_path.AppendASCII("layout_tests");
+ script_path = script_path.AppendASCII("third_party");
+ script_path = script_path.AppendASCII("WebKit");
+ script_path = script_path.AppendASCII("WebKitTools");
+ script_path = script_path.AppendASCII("Scripts");
script_path = script_path.AppendASCII("webkitpy");
script_path = script_path.AppendASCII("layout_tests");
- script_path = script_path.AppendASCII("layout_package");
+ script_path = script_path.AppendASCII("port");
script_path = script_path.AppendASCII("websocket_server.py");
CommandLine* cmd_line = CreatePythonCommandLine();