summaryrefslogtreecommitdiffstats
path: root/webkit/tools/layout_tests/rebaseline.py
diff options
context:
space:
mode:
authorvictorw@chromium.org <victorw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-30 16:15:26 +0000
committervictorw@chromium.org <victorw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-30 16:15:26 +0000
commit57701a5b374ad2efe1bc919063d8236ee810bb71 (patch)
tree5eb164a00301dfc12cd4c1fbb2f9bc340f1fe611 /webkit/tools/layout_tests/rebaseline.py
parentb6e9a55f5c6542ed032c41dc06b85fec5ed63931 (diff)
downloadchromium_src-57701a5b374ad2efe1bc919063d8236ee810bb71.zip
chromium_src-57701a5b374ad2efe1bc919063d8236ee810bb71.tar.gz
chromium_src-57701a5b374ad2efe1bc919063d8236ee810bb71.tar.bz2
Allow layout tests to be located both in src/webkit/data/layout_tests and third_party/WebKit.
For tests in LayoutTests directory, the script checks whether the LayoutTests directory exists in webkit/data/layout_tests, if not, assume it is in third_party/WebKit. Basically, this patch = http_server change + Dimitri Glazkov's patch (http://codereview.chromium.org/115302). BUG=8765 TEST=none Review URL: http://codereview.chromium.org/146112 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19590 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/layout_tests/rebaseline.py')
-rw-r--r--webkit/tools/layout_tests/rebaseline.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/webkit/tools/layout_tests/rebaseline.py b/webkit/tools/layout_tests/rebaseline.py
index 9d977ad..c3af23c 100644
--- a/webkit/tools/layout_tests/rebaseline.py
+++ b/webkit/tools/layout_tests/rebaseline.py
@@ -667,7 +667,7 @@ class HtmlGenerator(object):
rows.append(self.HTML_TR % row)
if rows:
- test_path = os.path.join(path_utils.LayoutDataDir(), test)
+ test_path = os.path.join(path_utils.LayoutTestsDir(), test)
html = self.HTML_TR_TEST % (path_utils.FilenameToUri(test_path), test)
html += self.HTML_TEST_DETAIL % ' '.join(rows)