commit 7a5978e4cd914c7298133eac08e2fbc57d18c562
author Jeremy Leconte <jleconte@google.com> Tue Feb 22 07:26:33 2022
committer WebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Feb 22 07:57:34 2022
tree a8452393b1424a589f2759ff93e64a3d1af6259b
parent 694eae7064b6b53162e6a8084366dfb5618677bd

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 <mbonadei@webrtc.org>
> Commit-Queue: Jeremy Leconte <jleconte@google.com>
> 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 <mbonadei@webrtc.org>
Commit-Queue: Jeremy Leconte <jleconte@google.com>
Cr-Commit-Position: refs/heads/main@{#36042}

audio/test/low_bandwidth_audio_test.py

diff --git a/audio/test/low_bandwidth_audio_test.py b/audio/test/low_bandwidth_audio_test.py
index 386572f..051d67f 100755
--- a/audio/test/low_bandwidth_audio_test.py
+++ b/audio/test/low_bandwidth_audio_test.py
@@ -296,9 +296,6 @@
   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 @@
     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()
 
 

tools_webrtc/flags_compatibility.py

diff --git a/tools_webrtc/flags_compatibility.py b/tools_webrtc/flags_compatibility.py
index e7aeb93..72c66a5 100755
--- a/tools_webrtc/flags_compatibility.py
+++ b/tools_webrtc/flags_compatibility.py
@@ -22,7 +22,9 @@
 
   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=' +