summaryrefslogtreecommitdiffstats
path: root/chrome/browser/in_process_webkit
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/browser/in_process_webkit
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/browser/in_process_webkit')
-rw-r--r--chrome/browser/in_process_webkit/dom_storage_uitest.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/in_process_webkit/dom_storage_uitest.cc b/chrome/browser/in_process_webkit/dom_storage_uitest.cc
index 2880f75..88cfa871 100644
--- a/chrome/browser/in_process_webkit/dom_storage_uitest.cc
+++ b/chrome/browser/in_process_webkit/dom_storage_uitest.cc
@@ -40,7 +40,8 @@ class DOMStorageTest : public UILayoutTest {
protected:
DOMStorageTest()
: UILayoutTest(),
- test_dir_(FilePath().AppendASCII("storage").AppendASCII("domstorage")) {
+ test_dir_(FilePath().AppendASCII("LayoutTests").
+ AppendASCII("storage").AppendASCII("domstorage")) {
}
virtual ~DOMStorageTest() { }
@@ -54,7 +55,8 @@ class DOMStorageTest : public UILayoutTest {
// Add those to the list to be copied.
void AddJSTestResources() {
// Add other paths our tests require.
- FilePath js_dir = FilePath().AppendASCII("fast").AppendASCII("js");
+ FilePath js_dir = FilePath().AppendASCII("LayoutTests").
+ AppendASCII("fast").AppendASCII("js");
AddResourceForLayoutTest(js_dir, FilePath().AppendASCII("resources"));
}