From 642a49d1eb20b8c5744e745de79ddb585e0f7472 Mon Sep 17 00:00:00 2001 From: Mirko Bonadei Date: Wed, 10 Jul 2019 19:21:20 +0200 Subject: [PATCH] Add wrapper to normalize flags. Bug: None Change-Id: I9d43602cc66198a29dbc0e7586d948ee76c5ec84 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/145204 Commit-Queue: Mirko Bonadei Reviewed-by: Oleh Prypin Cr-Commit-Position: refs/heads/master@{#28532} --- BUILD.gn | 3 ++- tools_webrtc/flags_compatibility.py | 37 +++++++++++++++++++++++++++++ tools_webrtc/mb/gn_isolate_map.pyl | 6 ++++- 3 files changed, 44 insertions(+), 2 deletions(-) create mode 100644 tools_webrtc/flags_compatibility.py diff --git a/BUILD.gn b/BUILD.gn index af0de9f528..d3c1ed5f94 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -609,7 +609,8 @@ if (rtc_include_tests) { "video:video_pc_full_stack_tests", ] - data = webrtc_perf_tests_resources + data = + webrtc_perf_tests_resources + [ "tools_webrtc/flags_compatibility.py" ] if (is_android) { deps += [ "//testing/android/native_test:native_test_native_code" ] shard_timeout = 4500 diff --git a/tools_webrtc/flags_compatibility.py b/tools_webrtc/flags_compatibility.py new file mode 100644 index 0000000000..a1639c2646 --- /dev/null +++ b/tools_webrtc/flags_compatibility.py @@ -0,0 +1,37 @@ +#!/usr/bin/env python + +# Copyright (c) 2019 The WebRTC project authors. All Rights Reserved. +# +# Use of this source code is governed by a BSD-style license +# that can be found in the LICENSE file in the root of the source +# tree. An additional intellectual property rights grant can be found +# in the file PATENTS. All contributing project authors may +# be found in the AUTHORS file in the root of the source tree. + +import argparse +import logging +import subprocess +import sys + +def main(): + parser = argparse.ArgumentParser() + parser.add_argument('--isolated-script-test-output') + parser.add_argument('--isolated-script-test-perf-output') + args, unrecognized_args = parser.parse_known_args() + + test_command = unrecognized_args + if args.isolated_script_test_output: + test_command += ['--isolated_script_test_output', + args.isolated_script_test_output] + if args.isolated_script_test_perf_output: + test_command += ['--isolated_script_test_perf_output', + args.isolated_script_test_perf_output] + logging.info('Running %r', test_command) + + return subprocess.call(test_command) + + +if __name__ == '__main__': + # pylint: disable=W0101 + logging.basicConfig(level=logging.INFO) + sys.exit(main()) diff --git a/tools_webrtc/mb/gn_isolate_map.pyl b/tools_webrtc/mb/gn_isolate_map.pyl index 43bdc17254..0b49ca90aa 100644 --- a/tools_webrtc/mb/gn_isolate_map.pyl +++ b/tools_webrtc/mb/gn_isolate_map.pyl @@ -127,6 +127,10 @@ "webrtc_perf_tests": { "label": "//:webrtc_perf_tests", "timeout": 3600, # 1 hour - "type": "raw", + "type": "script", + "script": "//tools_webrtc/flags_compatibility.py", + "args": [ + "./webrtc_perf_tests", + ], }, }