diff options
| -rw-r--r-- | python/generators/diff_tests/runner.py | 4 | ||||
| -rwxr-xr-x | tools/diff_test_trace_processor.py | 9 | ||||
| -rwxr-xr-x | tools/serialize_test_trace.py | 6 |
3 files changed, 13 insertions, 6 deletions
diff --git a/python/generators/diff_tests/runner.py b/python/generators/diff_tests/runner.py index 7c77d544b..0fe0982ff 100644 --- a/python/generators/diff_tests/runner.py +++ b/python/generators/diff_tests/runner.py @@ -450,7 +450,7 @@ class DiffTestsRunner: override_sql_module_paths)) def run_all_tests(self, metrics_descriptor_paths: List[str], - chrome_extensions: str, test_extensions: str, + chrome_extensions: str, test_extensions: str, winscope_extensions: str, keep_input: bool, rebase: bool) -> TestResults: perf_results = [] failures = [] @@ -459,7 +459,7 @@ class DiffTestsRunner: with concurrent.futures.ProcessPoolExecutor() as e: fut = [ - e.submit(test.execute, [chrome_extensions, test_extensions], + e.submit(test.execute, [chrome_extensions, test_extensions, winscope_extensions], metrics_descriptor_paths, keep_input, rebase) for test in self.test_runners ] diff --git a/tools/diff_test_trace_processor.py b/tools/diff_test_trace_processor.py index 531676316..369cde438 100755 --- a/tools/diff_test_trace_processor.py +++ b/tools/diff_test_trace_processor.py @@ -41,6 +41,7 @@ def main(): parser.add_argument('--metrics-descriptor', nargs='+', type=str) parser.add_argument('--chrome-track-event-descriptor', type=str, default=None) parser.add_argument('--test-extensions', type=str, default=None) + parser.add_argument('--winscope-extensions', type=str, default=None) parser.add_argument('--perf-file', type=str) parser.add_argument( '--override-sql-module', type=str, action='append', default=[]) @@ -72,6 +73,9 @@ def main(): if args.test_extensions is None: args.test_extensions = os.path.join(out_path, 'gen', 'protos', 'perfetto', 'trace', 'test_extensions.descriptor') + if args.winscope_extensions is None: + args.winscope_extensions = os.path.join(out_path, 'gen', 'protos', 'perfetto', 'trace', + 'android', 'winscope.descriptor') test_runner = DiffTestsRunner(args.name_filter, args.trace_processor, args.trace_descriptor, args.no_colors, @@ -79,9 +83,8 @@ def main(): sys.stderr.write(f"[==========] Running {len(test_runner.tests)} tests.\n") results = test_runner.run_all_tests(args.metrics_descriptor, - args.chrome_track_event_descriptor, - args.test_extensions, args.keep_input, - args.rebase) + args.chrome_track_event_descriptor, args.test_extensions, + args.winscope_extensions, args.keep_input, args.rebase) sys.stderr.write(results.str(args.no_colors, len(test_runner.tests))) if args.rebase: diff --git a/tools/serialize_test_trace.py b/tools/serialize_test_trace.py index 6c7fa85d0..f20710143 100755 --- a/tools/serialize_test_trace.py +++ b/tools/serialize_test_trace.py @@ -45,8 +45,12 @@ def main(): trace_descriptor_path = os.path.join(trace_protos_path, 'trace.descriptor') test_extensions_descriptor_path = os.path.join( trace_protos_path, 'test_extensions.descriptor') + winscope_extensions_descriptor_path = os.path.join( + trace_protos_path, 'android', 'winscope.descriptor') extension_descriptors = [ - chrome_extension_descriptor_path, test_extensions_descriptor_path + chrome_extension_descriptor_path, + test_extensions_descriptor_path, + winscope_extensions_descriptor_path ] elif args.descriptor and not args.out: trace_descriptor_path = args.descriptor |