Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(105)

Unified Diff: testing/scripts/nacl_integration.py

Issue 693943003: Update from https://crrev.com/302630 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « testing/buildbot/chromium.win.json ('k') | third_party/libevent/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: testing/scripts/nacl_integration.py
diff --git a/testing/scripts/checkdeps.py b/testing/scripts/nacl_integration.py
similarity index 56%
copy from testing/scripts/checkdeps.py
copy to testing/scripts/nacl_integration.py
index d6140dac127c1f9ebb0cf3af04003f756263aad6..f308b78b1cbfcdd85f083f45070106e58d4ce341 100755
--- a/testing/scripts/checkdeps.py
+++ b/testing/scripts/nacl_integration.py
@@ -12,30 +12,33 @@ import common
def main_run(args):
+ filter_tests = []
+ if args.filter_file:
+ filter_tests = json.load(args.filter_file)
+
with common.temporary_file() as tempfile_path:
rc = common.run_command([
- os.path.join(common.SRC_DIR, 'buildtools', 'checkdeps', 'checkdeps.py'),
- '--json', tempfile_path
- ])
+ sys.executable,
+ os.path.join(common.SRC_DIR, 'chrome', 'test', 'nacl_test_injection',
+ 'buildbot_nacl_integration.py'),
+ '--mode', args.build_config_fs,
+ '--json_build_results_output_file', tempfile_path,
+ ] + filter_tests)
with open(tempfile_path) as f:
- checkdeps_results = json.load(f)
+ results = json.load(f)
- result_set = set()
- for result in checkdeps_results:
- for violation in result['violations']:
- result_set.add((result['dependee_path'], violation['include_path']))
json.dump({
'valid': True,
- 'failures': ['%s: %s' % (r[0], r[1]) for r in result_set],
+ 'failures': [f['raw_name'] for f in results],
}, args.output)
return rc
def main_compile_targets(args):
- json.dump([], args.output)
+ json.dump(['chrome'], args.output)
if __name__ == '__main__':
« no previous file with comments | « testing/buildbot/chromium.win.json ('k') | third_party/libevent/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698