diff --git a/infra/specs/client.webrtc.perf.json b/infra/specs/client.webrtc.perf.json index 68c9563178..7e4127088e 100644 --- a/infra/specs/client.webrtc.perf.json +++ b/infra/specs/client.webrtc.perf.json @@ -17,7 +17,7 @@ "--test-suite", "low_bandwidth_audio_perf_test" ], - "script": "//tools_webrtc/perf/process_perf_results_py2.py" + "script": "//tools_webrtc/perf/process_perf_results.py" }, "resultdb": { "enable": true, @@ -51,7 +51,7 @@ "--test-suite", "webrtc_perf_tests" ], - "script": "//tools_webrtc/perf/process_perf_results_py2.py" + "script": "//tools_webrtc/perf/process_perf_results.py" }, "resultdb": { "enable": true, @@ -93,7 +93,7 @@ "--test-suite", "low_bandwidth_audio_perf_test" ], - "script": "//tools_webrtc/perf/process_perf_results_py2.py" + "script": "//tools_webrtc/perf/process_perf_results.py" }, "resultdb": { "enable": true, @@ -127,7 +127,7 @@ "--test-suite", "webrtc_perf_tests" ], - "script": "//tools_webrtc/perf/process_perf_results_py2.py" + "script": "//tools_webrtc/perf/process_perf_results.py" }, "resultdb": { "enable": true, @@ -169,7 +169,7 @@ "--test-suite", "low_bandwidth_audio_perf_test" ], - "script": "//tools_webrtc/perf/process_perf_results_py2.py" + "script": "//tools_webrtc/perf/process_perf_results.py" }, "resultdb": { "enable": true, @@ -203,7 +203,7 @@ "--test-suite", "webrtc_perf_tests" ], - "script": "//tools_webrtc/perf/process_perf_results_py2.py" + "script": "//tools_webrtc/perf/process_perf_results.py" }, "resultdb": { "enable": true, @@ -245,7 +245,7 @@ "--test-suite", "low_bandwidth_audio_perf_test" ], - "script": "//tools_webrtc/perf/process_perf_results_py2.py" + "script": "//tools_webrtc/perf/process_perf_results.py" }, "resultdb": { "enable": true, @@ -278,7 +278,7 @@ "--test-suite", "webrtc_perf_tests" ], - "script": "//tools_webrtc/perf/process_perf_results_py2.py" + "script": "//tools_webrtc/perf/process_perf_results.py" }, "resultdb": { "enable": true, @@ -317,7 +317,7 @@ "--test-suite", "low_bandwidth_audio_perf_test" ], - "script": "//tools_webrtc/perf/process_perf_results_py2.py" + "script": "//tools_webrtc/perf/process_perf_results.py" }, "name": "low_bandwidth_audio_perf_test", "resultdb": { @@ -351,7 +351,7 @@ "--test-suite", "webrtc_perf_tests" ], - "script": "//tools_webrtc/perf/process_perf_results_py2.py" + "script": "//tools_webrtc/perf/process_perf_results.py" }, "name": "webrtc_perf_tests", "resultdb": { @@ -388,7 +388,7 @@ "--test-suite", "low_bandwidth_audio_perf_test" ], - "script": "//tools_webrtc/perf/process_perf_results_py2.py" + "script": "//tools_webrtc/perf/process_perf_results.py" }, "name": "low_bandwidth_audio_perf_test", "resultdb": { @@ -423,7 +423,7 @@ "--test-suite", "webrtc_perf_tests" ], - "script": "//tools_webrtc/perf/process_perf_results_py2.py" + "script": "//tools_webrtc/perf/process_perf_results.py" }, "name": "webrtc_perf_tests", "resultdb": { @@ -460,7 +460,7 @@ "--test-suite", "webrtc_perf_tests" ], - "script": "//tools_webrtc/perf/process_perf_results_py2.py" + "script": "//tools_webrtc/perf/process_perf_results.py" }, "name": "webrtc_perf_tests", "resultdb": { @@ -498,7 +498,7 @@ "--test-suite", "low_bandwidth_audio_perf_test" ], - "script": "//tools_webrtc/perf/process_perf_results_py2.py" + "script": "//tools_webrtc/perf/process_perf_results.py" }, "name": "low_bandwidth_audio_perf_test", "resultdb": { @@ -532,7 +532,7 @@ "--test-suite", "webrtc_perf_tests" ], - "script": "//tools_webrtc/perf/process_perf_results_py2.py" + "script": "//tools_webrtc/perf/process_perf_results.py" }, "name": "webrtc_perf_tests", "resultdb": { diff --git a/infra/specs/internal.client.webrtc.json b/infra/specs/internal.client.webrtc.json index d451e5cbf4..e4286de4d3 100644 --- a/infra/specs/internal.client.webrtc.json +++ b/infra/specs/internal.client.webrtc.json @@ -512,7 +512,7 @@ "--test-suite", "webrtc_perf_tests" ], - "script": "//tools_webrtc/perf/process_perf_results_py2.py" + "script": "//tools_webrtc/perf/process_perf_results.py" }, "name": "webrtc_perf_tests", "resultdb": { diff --git a/infra/specs/mixins.pyl b/infra/specs/mixins.pyl index b353b193d4..7f10358435 100644 --- a/infra/specs/mixins.pyl +++ b/infra/specs/mixins.pyl @@ -206,7 +206,7 @@ }, 'perf-low-bandwidth-audio-perf-test': { 'merge': { - 'script': '//tools_webrtc/perf/process_perf_results_py2.py', + 'script': '//tools_webrtc/perf/process_perf_results.py', 'args': ['--test-suite', 'low_bandwidth_audio_perf_test'] } }, @@ -227,7 +227,7 @@ }, 'perf-webrtc-perf-tests': { 'merge': { - 'script': '//tools_webrtc/perf/process_perf_results_py2.py', + 'script': '//tools_webrtc/perf/process_perf_results.py', 'args': ['--test-suite', 'webrtc_perf_tests'] }, '$mixin_append': { diff --git a/infra/specs/mixins_webrtc.pyl b/infra/specs/mixins_webrtc.pyl index a071832c66..d890dacbcf 100644 --- a/infra/specs/mixins_webrtc.pyl +++ b/infra/specs/mixins_webrtc.pyl @@ -134,7 +134,7 @@ }, 'perf-low-bandwidth-audio-perf-test': { 'merge': { - 'script': '//tools_webrtc/perf/process_perf_results_py2.py', + 'script': '//tools_webrtc/perf/process_perf_results.py', 'args': ['--test-suite', 'low_bandwidth_audio_perf_test'], }, }, @@ -158,7 +158,7 @@ }, 'perf-webrtc-perf-tests': { 'merge': { - 'script': '//tools_webrtc/perf/process_perf_results_py2.py', + 'script': '//tools_webrtc/perf/process_perf_results.py', 'args': ['--test-suite', 'webrtc_perf_tests'], }, '$mixin_append': { diff --git a/tools_webrtc/perf/process_perf_results_py2.py b/tools_webrtc/perf/process_perf_results_py2.py deleted file mode 100644 index 14b6858093..0000000000 --- a/tools_webrtc/perf/process_perf_results_py2.py +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env vpython3 - -# Copyright (c) 2022 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. -"""Calls process_perf_results.py with a python 3 interpreter.""" - -import sys -import subprocess - - -# TODO(crbug.com/webrtc/13835): Delete this file and use -# process_perf_results.py instead. -def main(): - cmd = sys.argv[0].replace('_py2', '') - print('Calling "%s" with py3 in case this script was called with py2.' % cmd) - return subprocess.call(['vpython3', cmd] + sys.argv[1:]) - - -if __name__ == '__main__': - sys.exit(main())