| 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
|
|
|