| Index: testing/scripts/mojo_apptest.py
|
| diff --git a/testing/scripts/webkit_python_tests.py b/testing/scripts/mojo_apptest.py
|
| similarity index 62%
|
| copy from testing/scripts/webkit_python_tests.py
|
| copy to testing/scripts/mojo_apptest.py
|
| index b0c2fbc1c7296da71cc862e88c610bc572d96e6e..09e3f234fd1fb68836ce4f5049807e475560e85d 100755
|
| --- a/testing/scripts/webkit_python_tests.py
|
| +++ b/testing/scripts/mojo_apptest.py
|
| @@ -12,18 +12,17 @@ import common
|
|
|
|
|
| def main_run(args):
|
| - with common.temporary_file() as tempfile_path:
|
| - rc = common.run_command([
|
| - sys.executable,
|
| - os.path.join(common.SRC_DIR, 'third_party', 'WebKit',
|
| - 'Tools', 'Scripts', 'test-webkitpy'),
|
| - '--write-full-results-to', tempfile_path,
|
| - ])
|
| + runner = os.path.join(common.SRC_DIR, 'mojo', 'tools', 'apptest_runner.py')
|
| + tests = os.path.join(common.SRC_DIR, 'mojo', 'tools', 'data', 'apptests')
|
| + build_dir = os.path.join(common.SRC_DIR, 'out', args.build_config_fs)
|
|
|
| + with common.temporary_file() as tempfile_path:
|
| + rc = common.run_command([runner, tests, build_dir, '--verbose',
|
| + '--write-full-results-to', tempfile_path])
|
| with open(tempfile_path) as f:
|
| results = json.load(f)
|
|
|
| - parsed_results = common.parse_common_test_results(results)
|
| + parsed_results = common.parse_common_test_results(results, test_separator='.')
|
| failures = parsed_results['unexpected_failures']
|
|
|
| json.dump({
|
| @@ -36,7 +35,7 @@ def main_run(args):
|
|
|
|
|
| def main_compile_targets(args):
|
| - json.dump([], args.output)
|
| + json.dump(['mandoline:tests'], args.output)
|
|
|
|
|
| if __name__ == '__main__':
|
|
|