mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-14 14:20:45 +01:00
Fix perf tests.
Turns out it's not possible to run the same perf tests on all os: --save_worst_frame doesn't work on Fuchsia bots: https://chromium-swarm.appspot.com/task?id=6294b51713605710 video_codec perf tests fail on iOS: https://chrome-swarming.appspot.com/task?id=629455defc12bc10 Change-Id: I5cd490f5728b6046615ba217c65fd2b125a9e4a7 Bug: None Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/307480 Reviewed-by: Björn Terelius <terelius@webrtc.org> Commit-Queue: Jeremy Leconte <jleconte@google.com> Cr-Commit-Position: refs/heads/main@{#40209}
This commit is contained in:
parent
3488726163
commit
b15a9f01fc
4 changed files with 18 additions and 68 deletions
|
@ -40,8 +40,6 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"args": [
|
"args": [
|
||||||
"--test_artifacts_dir=${ISOLATED_OUTDIR}",
|
|
||||||
"--save_worst_frame",
|
|
||||||
"--isolated-script-test-perf-output=${ISOLATED_OUTDIR}/perftest-output.pb",
|
"--isolated-script-test-perf-output=${ISOLATED_OUTDIR}/perftest-output.pb",
|
||||||
"--nologs"
|
"--nologs"
|
||||||
],
|
],
|
||||||
|
@ -117,8 +115,6 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"args": [
|
"args": [
|
||||||
"--test_artifacts_dir=${ISOLATED_OUTDIR}",
|
|
||||||
"--save_worst_frame",
|
|
||||||
"--isolated-script-test-perf-output=${ISOLATED_OUTDIR}/perftest-output.pb",
|
"--isolated-script-test-perf-output=${ISOLATED_OUTDIR}/perftest-output.pb",
|
||||||
"--nologs"
|
"--nologs"
|
||||||
],
|
],
|
||||||
|
@ -194,8 +190,6 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"args": [
|
"args": [
|
||||||
"--test_artifacts_dir=${ISOLATED_OUTDIR}",
|
|
||||||
"--save_worst_frame",
|
|
||||||
"--isolated-script-test-perf-output=${ISOLATED_OUTDIR}/perftest-output.pb",
|
"--isolated-script-test-perf-output=${ISOLATED_OUTDIR}/perftest-output.pb",
|
||||||
"--nologs"
|
"--nologs"
|
||||||
],
|
],
|
||||||
|
@ -271,8 +265,6 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"args": [
|
"args": [
|
||||||
"--test_artifacts_dir=${ISOLATED_OUTDIR}",
|
|
||||||
"--save_worst_frame",
|
|
||||||
"--isolated-script-test-perf-output=${ISOLATED_OUTDIR}/perftest-output.pb",
|
"--isolated-script-test-perf-output=${ISOLATED_OUTDIR}/perftest-output.pb",
|
||||||
"--nologs"
|
"--nologs"
|
||||||
],
|
],
|
||||||
|
@ -351,8 +343,6 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"args": [
|
"args": [
|
||||||
"--test_artifacts_dir=${ISOLATED_OUTDIR}",
|
|
||||||
"--save_worst_frame",
|
|
||||||
"--gtest_output=json:${ISOLATED_OUTDIR}/gtest_output.json",
|
"--gtest_output=json:${ISOLATED_OUTDIR}/gtest_output.json",
|
||||||
"--test-launcher-summary-output=${ISOLATED_OUTDIR}/gtest_output.json",
|
"--test-launcher-summary-output=${ISOLATED_OUTDIR}/gtest_output.json",
|
||||||
"--test-arg=--gtest_output=json:/custom_artifacts/gtest_output.json",
|
"--test-arg=--gtest_output=json:/custom_artifacts/gtest_output.json",
|
||||||
|
|
|
@ -477,59 +477,6 @@
|
||||||
"isolated_scripts": [
|
"isolated_scripts": [
|
||||||
{
|
{
|
||||||
"args": [
|
"args": [
|
||||||
"--write_perf_output_on_ios",
|
|
||||||
"--xctest",
|
|
||||||
"--xcode-build-version",
|
|
||||||
"13c100",
|
|
||||||
"--out-dir",
|
|
||||||
"${ISOLATED_OUTDIR}"
|
|
||||||
],
|
|
||||||
"isolate_name": "video_codec_perf_tests",
|
|
||||||
"merge": {
|
|
||||||
"args": [
|
|
||||||
"--test-suite",
|
|
||||||
"video_codec_perf_tests"
|
|
||||||
],
|
|
||||||
"script": "//tools_webrtc/perf/process_perf_results.py"
|
|
||||||
},
|
|
||||||
"name": "video_codec_perf_tests",
|
|
||||||
"resultdb": {
|
|
||||||
"enable": true,
|
|
||||||
"has_native_resultdb_integration": true
|
|
||||||
},
|
|
||||||
"swarming": {
|
|
||||||
"can_use_on_swarming_builders": true,
|
|
||||||
"cipd_packages": [
|
|
||||||
{
|
|
||||||
"cipd_package": "infra/tools/mac_toolchain/${platform}",
|
|
||||||
"location": ".",
|
|
||||||
"revision": "git_revision:a598cd77abc01089647a79e3cfa3cc8e8ecb5118"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"dimension_sets": [
|
|
||||||
{
|
|
||||||
"id": "mac-254-e504",
|
|
||||||
"os": "iOS-12.4.1",
|
|
||||||
"pool": "WebRTC"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"hard_timeout": 10800,
|
|
||||||
"idempotent": false,
|
|
||||||
"io_timeout": 10800,
|
|
||||||
"named_caches": [
|
|
||||||
{
|
|
||||||
"name": "xcode_ios_13c100",
|
|
||||||
"path": "Xcode.app"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"service_account": "chrome-tester@chops-service-accounts.iam.gserviceaccount.com"
|
|
||||||
},
|
|
||||||
"test_id_prefix": "ninja://modules/video_coding:video_codec_perf_tests/"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"args": [
|
|
||||||
"--test_artifacts_dir=${ISOLATED_OUTDIR}",
|
|
||||||
"--save_worst_frame",
|
|
||||||
"--write_perf_output_on_ios",
|
"--write_perf_output_on_ios",
|
||||||
"--xctest",
|
"--xctest",
|
||||||
"--xcode-build-version",
|
"--xcode-build-version",
|
||||||
|
|
|
@ -203,6 +203,19 @@
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
'perf_tests': {
|
'perf_tests': {
|
||||||
|
'video_codec_perf_tests': {
|
||||||
|
'mixins': ['perf-video-codec-perf-tests'],
|
||||||
|
},
|
||||||
|
'webrtc_perf_tests': {
|
||||||
|
'mixins': ['perf-webrtc-perf-tests'],
|
||||||
|
},
|
||||||
|
},
|
||||||
|
'perf_tests_no_video_codec': {
|
||||||
|
'webrtc_perf_tests': {
|
||||||
|
'mixins': ['perf-webrtc-perf-tests'],
|
||||||
|
},
|
||||||
|
},
|
||||||
|
'perf_tests_save_worst_frame': {
|
||||||
'video_codec_perf_tests': {
|
'video_codec_perf_tests': {
|
||||||
'mixins': ['perf-video-codec-perf-tests'],
|
'mixins': ['perf-video-codec-perf-tests'],
|
||||||
},
|
},
|
||||||
|
|
|
@ -302,7 +302,7 @@
|
||||||
'resultdb-gtest-json-format'
|
'resultdb-gtest-json-format'
|
||||||
],
|
],
|
||||||
'test_suites': {
|
'test_suites': {
|
||||||
'isolated_scripts': 'perf_tests',
|
'isolated_scripts': 'perf_tests_save_worst_frame',
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
'Perf Mac 11': {
|
'Perf Mac 11': {
|
||||||
|
@ -313,7 +313,7 @@
|
||||||
'resultdb-gtest-json-format'
|
'resultdb-gtest-json-format'
|
||||||
],
|
],
|
||||||
'test_suites': {
|
'test_suites': {
|
||||||
'isolated_scripts': 'perf_tests',
|
'isolated_scripts': 'perf_tests_save_worst_frame',
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
'Perf Mac M1 Arm64 12': {
|
'Perf Mac M1 Arm64 12': {
|
||||||
|
@ -324,7 +324,7 @@
|
||||||
'resultdb-gtest-json-format'
|
'resultdb-gtest-json-format'
|
||||||
],
|
],
|
||||||
'test_suites': {
|
'test_suites': {
|
||||||
'isolated_scripts': 'perf_tests',
|
'isolated_scripts': 'perf_tests_save_worst_frame',
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
'Perf Win 10': {
|
'Perf Win 10': {
|
||||||
|
@ -333,7 +333,7 @@
|
||||||
'mixins':
|
'mixins':
|
||||||
['win10-any', 'perf-pool', 'timeout-3h', 'resultdb-gtest-json-format'],
|
['win10-any', 'perf-pool', 'timeout-3h', 'resultdb-gtest-json-format'],
|
||||||
'test_suites': {
|
'test_suites': {
|
||||||
'isolated_scripts': 'perf_tests',
|
'isolated_scripts': 'perf_tests_save_worst_frame',
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
@ -359,7 +359,7 @@
|
||||||
'has_native_resultdb_integration', 'out_dir_arg'
|
'has_native_resultdb_integration', 'out_dir_arg'
|
||||||
],
|
],
|
||||||
'test_suites': {
|
'test_suites': {
|
||||||
'isolated_scripts': 'perf_tests',
|
'isolated_scripts': 'perf_tests_no_video_codec',
|
||||||
},
|
},
|
||||||
'args': [
|
'args': [
|
||||||
'--write_perf_output_on_ios',
|
'--write_perf_output_on_ios',
|
||||||
|
|
Loading…
Reference in a new issue