Import Qt5x2 branch of QtWebkit for Qt 5.2

Importing a new snapshot of webkit.

Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>

1 files changed, 5 insertions, 17 deletions

diff --git a/Tools/TestResultServer/generate_builders_json.py b/Tools/TestResultServer/generate_builders_json.py
index 9be6552ce..43688455b 100644
--- a/Tools/TestResultServer/generate_builders_json.py
+++ b/Tools/TestResultServer/generate_builders_json.py
@@ -71,16 +71,12 @@ def insert_builder_and_test_data(masters):
 
             for step in fetch_json(cached_build_json_url(master_url, builder, latest_cached_build))['steps']:
                 step_name = step['name']
-
-                # The chromium bots call this step webkit-tests, the webkit.org bots call it layout-test. :(
-                # The files stored at test-results.appspot.com use layout-tests as the test suite name, so normalize to that.
-                if step_name in ['layout-test', 'webkit_tests']:
-                    step_name = 'layout-tests'
-
-                is_test = step_name == 'layout-tests' if master['name'] == 'webkit.org' else 'test' in step_name and 'archive' not in step_name
-                if not is_test:
+                if step_name != 'layout-test':
                     continue
 
+                # Adjust for backwards compatibility
+                step_name = 'layout-tests'
+
                 if step_name not in tests_object:
                     tests_object[step_name] = {'builders': []}
                 tests_object[step_name]['builders'].append(builder)
@@ -97,21 +93,13 @@ def main():
     logging.getLogger().setLevel(logging.DEBUG if options.verbose else logging.INFO)
 
     masters = [
-        {'name': 'ChromiumWin', 'url': 'http://build.chromium.org/p/chromium.win'},
-        {'name': 'ChromiumMac', 'url': 'http://build.chromium.org/p/chromium.mac'},
-        {'name': 'ChromiumLinux', 'url': 'http://build.chromium.org/p/chromium.linux'},
-        {'name': 'ChromiumChromiumOS', 'url': 'http://build.chromium.org/p/chromium.chromiumos'},
-        {'name': 'ChromiumGPU', 'url': 'http://build.chromium.org/p/chromium.gpu'},
-        {'name': 'ChromiumGPUFYI', 'url': 'http://build.chromium.org/p/chromium.gpu.fyi'},
-        {'name': 'ChromiumPerfAv', 'url': 'http://build.chromium.org/p/chromium.perf_av'},
-        {'name': 'ChromiumWebkit', 'url': 'http://build.chromium.org/p/chromium.webkit'},
         {'name': 'webkit.org', 'url': 'http://build.webkit.org'},
     ]
 
     insert_builder_and_test_data(masters)
 
     json_file_prefix = ('// This file is auto-generated by Tools/TestResultServer/generate_builders_json.py. It should not be manually modified.\n'
-        '// It uses jsonp instead of proper json because we want to be able to load it from a file URL in Chrome for local testing.\n'
+        '// It uses jsonp instead of proper json because we want to be able to load it from a file URL for local testing.\n'
         'LOAD_BUILDBOT_DATA(')
     json_file_suffix = ');\n';