From 7a5978e4cd914c7298133eac08e2fbc57d18c562 Mon Sep 17 00:00:00 2001 From: Jeremy Leconte Date: Tue, 22 Feb 2022 07:26:33 +0000 Subject: [PATCH] Revert "Add the possibility to output a json gtest output to the perf tests." This reverts commit cbfa235b3548ae1a0b8f5b80a879214ca5f1bd56. Reason for revert: iOS bots will use flags_compatibility with isolated_script_test_output but not gtest_output. Original change's description: > Add the possibility to output a json gtest output to the perf tests. > > We use the Chromium existing flag isolated_script_test_output that we translate into gtest_output. > This is because the Chromium flag has the same purpose as gtest_output and is already provided in the recipe modules. > > No-Presubmit: True > Bug: b/197492097 > Change-Id: Ia432a85b0e0ab32008b39ffe751d11aefb9b24ea > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/251041 > Reviewed-by: Mirko Bonadei > Commit-Queue: Jeremy Leconte > Cr-Commit-Position: refs/heads/main@{#35937} No-Presubmit: True Bug: b/197492097 Change-Id: I94e75328570f89011fbb0daf035f0072b8ea2f7d Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/252040 Reviewed-by: Mirko Bonadei Commit-Queue: Jeremy Leconte Cr-Commit-Position: refs/heads/main@{#36042} --- audio/test/low_bandwidth_audio_test.py | 7 ++++--- tools_webrtc/flags_compatibility.py | 4 +++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/audio/test/low_bandwidth_audio_test.py b/audio/test/low_bandwidth_audio_test.py index 386572f6e5..051d67fea4 100755 --- a/audio/test/low_bandwidth_audio_test.py +++ b/audio/test/low_bandwidth_audio_test.py @@ -296,9 +296,6 @@ def main(): else: test_command = [os.path.join(args.build_dir, 'low_bandwidth_audio_test')] - if args.isolated_script_test_output: - test_command += ['--gtest_output=json:' + args.isolated_script_test_output] - analyzers = [Analyzer('pesq', _RunPesq, pesq_path, 16000)] # Check if POLQA can run at all, or skip the 48 kHz tests entirely. example_path = os.path.join(SRC_DIR, 'resources', 'voice_engine', @@ -366,6 +363,10 @@ def main(): with open(args.isolated_script_test_perf_output, 'wb') as f: f.write(histograms.AsProto().SerializeToString()) + if args.isolated_script_test_output: + with open(args.isolated_script_test_output, 'w') as f: + json.dump({"version": 3}, f) + return test_process.wait() diff --git a/tools_webrtc/flags_compatibility.py b/tools_webrtc/flags_compatibility.py index e7aeb93faf..72c66a594f 100755 --- a/tools_webrtc/flags_compatibility.py +++ b/tools_webrtc/flags_compatibility.py @@ -22,7 +22,9 @@ def main(): test_command = _ForcePythonInterpreter(unrecognized_args) if args.isolated_script_test_output: - test_command += ['--gtest_output=json:' + 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=' +