diff --git a/infra/specs/client.webrtc.perf.json b/infra/specs/client.webrtc.perf.json index e6f4e6aad6..b121afc2e0 100644 --- a/infra/specs/client.webrtc.perf.json +++ b/infra/specs/client.webrtc.perf.json @@ -451,42 +451,6 @@ "isolated_scripts": [ { "args": [ - ".", - "--remove", - "--gtest_output=json:${ISOLATED_OUTDIR}/gtest_output.json" - ], - "isolate_name": "low_bandwidth_audio_perf_test", - "merge": { - "args": [ - "--test-suite", - "low_bandwidth_audio_perf_test" - ], - "script": "//tools_webrtc/perf/process_perf_results_py2.py" - }, - "name": "low_bandwidth_audio_perf_test", - "resultdb": { - "result_file": "${ISOLATED_OUTDIR}/gtest_output.json", - "result_format": "gtest_json" - }, - "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "cpu": "arm64-64-Apple_M1", - "os": "Mac-12", - "pool": "WebRTC-perf" - } - ], - "hard_timeout": 10800, - "idempotent": false, - "io_timeout": 10800 - }, - "test_id_prefix": "ninja://audio:low_bandwidth_audio_perf_test/" - }, - { - "args": [ - "--test_artifacts_dir=${ISOLATED_OUTDIR}", - "--save_worst_frame", "--gtest_output=json:${ISOLATED_OUTDIR}/gtest_output.json", "--nologs" ], diff --git a/infra/specs/internal.client.webrtc.json b/infra/specs/internal.client.webrtc.json index a4e8d9a322..d451e5cbf4 100644 --- a/infra/specs/internal.client.webrtc.json +++ b/infra/specs/internal.client.webrtc.json @@ -500,7 +500,6 @@ { "args": [ "--write_perf_output_on_ios", - "--nologs", "--xcode-build-version", "12d4e", "--out-dir", diff --git a/infra/specs/test_suites.pyl b/infra/specs/test_suites.pyl index 386d5ceeeb..774f0cdb49 100644 --- a/infra/specs/test_suites.pyl +++ b/infra/specs/test_suites.pyl @@ -138,12 +138,6 @@ 'mixins': ['shards-4'], }, }, - 'ios_perf_tests': { - 'webrtc_perf_tests': { - 'mixins': ['perf-webrtc-perf-tests'], - 'args': ['--write_perf_output_on_ios', '--nologs'] - }, - }, 'ios_simulator_tests': { 'apprtcmobile_tests': { 'mixins': ['xcode_parallelization'] @@ -229,6 +223,11 @@ }, }, }, + 'webrtc_perf_tests': { + 'webrtc_perf_tests': { + 'mixins': ['perf-webrtc-perf-tests'], + }, + }, 'win_video_capture_tests': { 'video_capture_tests': { 'remove_mixins': ['win7'], diff --git a/infra/specs/waterfalls.pyl b/infra/specs/waterfalls.pyl index 5b51b87652..0b146bd3c3 100644 --- a/infra/specs/waterfalls.pyl +++ b/infra/specs/waterfalls.pyl @@ -302,7 +302,7 @@ 'resultdb-gtest-json-format' ], 'test_suites': { - 'isolated_scripts': 'desktop_perf_tests', + 'isolated_scripts': 'webrtc_perf_tests', }, }, 'Perf Win7': { @@ -337,8 +337,11 @@ 'out_dir_arg' ], 'test_suites': { - 'isolated_scripts': 'ios_perf_tests', + 'isolated_scripts': 'webrtc_perf_tests', }, + 'args': [ + '--write_perf_output_on_ios', + ], }, 'iOS64 Release': { 'mixins': [