summaryrefslogtreecommitdiffstats
path: root/chrome/worker
diff options
context:
space:
mode:
authordpranke@google.com <dpranke@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-24 03:55:32 +0000
committerdpranke@google.com <dpranke@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-24 03:55:32 +0000
commit9ea7f625d9560ac02722545c8125ff3513e669b6 (patch)
treefde6c2649839aee438eed89f2b7d8565e85952c5 /chrome/worker
parent5c7f273e2d51be93df7fb27f6d032283c95366af (diff)
downloadchromium_src-9ea7f625d9560ac02722545c8125ff3513e669b6.zip
chromium_src-9ea7f625d9560ac02722545c8125ff3513e669b6.tar.gz
chromium_src-9ea7f625d9560ac02722545c8125ff3513e669b6.tar.bz2
Revert r42426 - tests are failing because the WebKit LayoutTests directories
aren't checked out on the bots. We need to figure out how to deal with this since we don't want to keep expectations downstream if we can avoid it. BUG=none R=none TEST=bots stay green Review URL: http://codereview.chromium.org/1253002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42427 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/worker')
-rw-r--r--chrome/worker/worker_uitest.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/worker/worker_uitest.cc b/chrome/worker/worker_uitest.cc
index 4c7914d..69906c4 100644
--- a/chrome/worker/worker_uitest.cc
+++ b/chrome/worker/worker_uitest.cc
@@ -79,6 +79,7 @@ class WorkerTest : public UILayoutTest {
void RunWorkerFastLayoutTest(const std::string& test_case_file_name) {
FilePath fast_test_dir;
+ fast_test_dir = fast_test_dir.AppendASCII("LayoutTests");
fast_test_dir = fast_test_dir.AppendASCII("fast");
FilePath worker_test_dir;
@@ -312,6 +313,7 @@ TEST_F(WorkerTest, DISABLED_SharedWorkerFastLayoutTests) {
};
FilePath fast_test_dir;
+ fast_test_dir = fast_test_dir.AppendASCII("LayoutTests");
fast_test_dir = fast_test_dir.AppendASCII("fast");
FilePath worker_test_dir;
@@ -349,6 +351,7 @@ TEST_F(WorkerTest, FLAKY_WorkerHttpLayoutTests) {
};
FilePath http_test_dir;
+ http_test_dir = http_test_dir.AppendASCII("LayoutTests");
http_test_dir = http_test_dir.AppendASCII("http");
http_test_dir = http_test_dir.AppendASCII("tests");