Chromium Code Reviews| Index: testing/buildbot/manage.py |
| diff --git a/testing/buildbot/manage.py b/testing/buildbot/manage.py |
| index 7a39176649a0cd2c8a6a8050092f5b1569ba44dc..ab6c3c75a9934187c108be6512c7380967e7d03d 100755 |
| --- a/testing/buildbot/manage.py |
| +++ b/testing/buildbot/manage.py |
| @@ -40,7 +40,6 @@ SKIP = { |
| # http://crbug.com/480053 |
| 'Linux GN', |
| 'Linux GN (dbg)', |
| - 'linux_chromium_gn_rel', |
| # Unmaintained builders on chromium.fyi |
| 'ClangToTMac', |
| @@ -138,7 +137,7 @@ def process_file(mode, test_name, tests_location, filepath, ninja_targets, |
| for d in data['gtest_tests']: |
| if (d['test'] not in ninja_targets and |
| d['test'] not in SKIP_NINJA_TO_GN_TARGETS): |
| - raise Error('%s: %s / %s is not listed in ninja_to_gn.pyl.' % |
| + raise Error('%s: %s / %s is not listed in gn_isolate_map.pyl.' % |
| (filename, builder, d['test'])) |
| elif d['test'] in ninja_targets: |
| ninja_targets_seen.add(d['test']) |
| @@ -268,8 +267,9 @@ def main(): |
| 'count_run_local': 0, 'count_run_on_swarming': 0, 'local_configs': {} |
| }) |
| - with open(os.path.join(THIS_DIR, "ninja_to_gn.pyl")) as fp: |
| - ninja_targets = ast.literal_eval(fp.read()) |
| + with open(os.path.join(THIS_DIR, "gn_isolate_map.pyl")) as fp: |
| + gn_isolate_map = ast.literal_eval(fp.read()) |
| + ninja_targets = dict((k, v['label']) for k, v in gn_isolate_map.items()) |
|
M-A Ruel
2015/07/22 18:22:42
Stylistically, I would have preferred:
ninja_targe
|
| try: |
| result = 0 |