diff options
| author | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-18 22:20:35 +0000 |
|---|---|---|
| committer | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-18 22:20:35 +0000 |
| commit | af25ae9e771cc8e660dfa6603ef833a481498c30 (patch) | |
| tree | b4d0337083098402c9ffffff12831941e138aafb /webkit | |
| parent | cbcb318e4871ab222acff46817cd89a39d51ceb4 (diff) | |
| download | chromium_src-af25ae9e771cc8e660dfa6603ef833a481498c30.zip chromium_src-af25ae9e771cc8e660dfa6603ef833a481498c30.tar.gz chromium_src-af25ae9e771cc8e660dfa6603ef833a481498c30.tar.bz2 | |
fix paths in test_output_xml_to_json since layout_package no longer exists
downstream. Remove the dependency on path_utils, and point to the upstream
version of the layout_package for test_expectations and
json_results_generator.
BUG=none
R=ojan@chromium.org,kinuko@chromium.org
TEST=vista ipc bot doesn't choke
Review URL: http://codereview.chromium.org/1140001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42010 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rwxr-xr-x | webkit/tools/layout_tests/webkitpy/layout_tests/test_output_xml_to_json.py | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/webkit/tools/layout_tests/webkitpy/layout_tests/test_output_xml_to_json.py b/webkit/tools/layout_tests/webkitpy/layout_tests/test_output_xml_to_json.py index 214428a..fb45a80 100755 --- a/webkit/tools/layout_tests/webkitpy/layout_tests/test_output_xml_to_json.py +++ b/webkit/tools/layout_tests/webkitpy/layout_tests/test_output_xml_to_json.py @@ -15,8 +15,16 @@ import time from xml.dom import minidom +try: + f = os.path.abspath(__file__) +except NameError: + f = os.path.abspath(sys.argv[0]) +base = f[0:f.index("webkit" + os.sep + "tools")] +webkitpy_dir = os.path.join(base, 'third_party', 'WebKit', 'WebKitTools', + 'Scripts', 'webkitpy') +sys.path.append(os.path.join(webkitpy_dir, 'thirdparty')) +sys.path.append(os.path.join(webkitpy_dir, 'layout_tests')) from layout_package import json_results_generator -from layout_package import path_utils from layout_package import test_expectations # Builder base URL where we have the archived test results. @@ -30,7 +38,7 @@ class JSONGeneratorFromXML(object): # Check the results directory if not os.path.exists(self._options.results_directory): - path_utils.maybe_make_directory(self._options.results_directory) + os.makedirs(self._options.results_directory) results_xml_file = None try: |