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

Unified Diff: testing/scripts/webkit_python_tests.py

Issue 988693005: Chromium roll (https://codereview.chromium.org/976353002) (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: fixed bad android build patch Created 5 years, 9 months 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/scripts/webkit_lint.py ('k') | third_party/ashmem/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: testing/scripts/webkit_python_tests.py
diff --git a/testing/scripts/webview_licenses.py b/testing/scripts/webkit_python_tests.py
similarity index 60%
copy from testing/scripts/webview_licenses.py
copy to testing/scripts/webkit_python_tests.py
index 255c62e993111f82f0d47d2445ed89312ea28c16..b0c2fbc1c7296da71cc862e88c610bc572d96e6e 100755
--- a/testing/scripts/webview_licenses.py
+++ b/testing/scripts/webkit_python_tests.py
@@ -14,18 +14,22 @@ import common
def main_run(args):
with common.temporary_file() as tempfile_path:
rc = common.run_command([
- os.path.join(common.SRC_DIR, 'android_webview', 'tools',
- 'webview_licenses.py'),
- 'scan',
- '--json', tempfile_path
+ sys.executable,
+ os.path.join(common.SRC_DIR, 'third_party', 'WebKit',
+ 'Tools', 'Scripts', 'test-webkitpy'),
+ '--write-full-results-to', tempfile_path,
])
with open(tempfile_path) as f:
results = json.load(f)
+ parsed_results = common.parse_common_test_results(results)
+ failures = parsed_results['unexpected_failures']
+
json.dump({
- 'valid': True,
- 'failures': results,
+ 'valid': bool(rc <= common.MAX_FAILURES_EXIT_STATUS and
+ ((rc == 0) or failures)),
+ 'failures': failures.keys(),
}, args.output)
return rc
« no previous file with comments | « testing/scripts/webkit_lint.py ('k') | third_party/ashmem/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698