summaryrefslogtreecommitdiffstats
path: root/webkit/tools
diff options
context:
space:
mode:
authordpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-18 23:03:31 +0000
committerdpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-18 23:03:31 +0000
commitceab0d7a29f413b83669989f788f570ba0ac1734 (patch)
tree81444ea8904c142a65e8ba57fd984f58f1647c53 /webkit/tools
parent3cc72b1caa55ca87811d8fab1ac9d55f05c2d496 (diff)
downloadchromium_src-ceab0d7a29f413b83669989f788f570ba0ac1734.zip
chromium_src-ceab0d7a29f413b83669989f788f570ba0ac1734.tar.gz
chromium_src-ceab0d7a29f413b83669989f788f570ba0ac1734.tar.bz2
Add port object and pass to the generator
BUG=none R=kinuko@chromium.org TEST=none Review URL: http://codereview.chromium.org/1114003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42023 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools')
-rwxr-xr-xwebkit/tools/layout_tests/webkitpy/layout_tests/test_output_xml_to_json.py7
1 files changed, 6 insertions, 1 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 fb45a80..24f20a0 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
@@ -24,6 +24,7 @@ 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'))
+import port
from layout_package import json_results_generator
from layout_package import test_expectations
@@ -36,6 +37,10 @@ class JSONGeneratorFromXML(object):
def __init__(self, options):
self._options = options
+ if not hasattr(options, 'chromium'):
+ options.chromium = True
+ port_obj = port.get(None, options)
+
# Check the results directory
if not os.path.exists(self._options.results_directory):
os.makedirs(self._options.results_directory)
@@ -52,7 +57,7 @@ class JSONGeneratorFromXML(object):
minidom.parse(results_xml_file).documentElement)
results_xml_file.close()
- json_results_generator.JSONResultsGenerator(
+ json_results_generator.JSONResultsGenerator(port_obj,
self._options.builder_name, self._options.build_name,
self._options.build_number, self._options.results_directory,
self._options.builder_base_url,