Fix missing perftest-output.pb file for Android perf bots.

Bug: webrtc:13899
Change-Id: Ica8fe3f90a80c79b5cd53b755cc0761292664547
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/258403
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Jeremy Leconte <jleconte@google.com>
Cr-Commit-Position: refs/heads/main@{#36507}
This commit is contained in:
Jeremy Leconte 2022-04-08 14:36:01 +02:00 committed by WebRTC LUCI CQ
parent 2e1ac58631
commit 616bea20e1
4 changed files with 30 additions and 8 deletions

View file

@ -7,7 +7,8 @@
"args": [ "args": [
"--android", "--android",
"--adb-path", "--adb-path",
"../../third_party/android_sdk/public/platform-tools/adb" "../../third_party/android_sdk/public/platform-tools/adb",
"--isolated-script-test-perf-output=${ISOLATED_OUTDIR}/perftest-output.pb"
], ],
"merge": { "merge": {
"args": [ "args": [
@ -39,6 +40,7 @@
}, },
{ {
"args": [ "args": [
"--isolated-script-test-perf-output=${ISOLATED_OUTDIR}/perftest-output.pb",
"--nologs" "--nologs"
], ],
"merge": { "merge": {
@ -77,7 +79,8 @@
"args": [ "args": [
"--android", "--android",
"--adb-path", "--adb-path",
"../../third_party/android_sdk/public/platform-tools/adb" "../../third_party/android_sdk/public/platform-tools/adb",
"--isolated-script-test-perf-output=${ISOLATED_OUTDIR}/perftest-output.pb"
], ],
"merge": { "merge": {
"args": [ "args": [
@ -109,6 +112,7 @@
}, },
{ {
"args": [ "args": [
"--isolated-script-test-perf-output=${ISOLATED_OUTDIR}/perftest-output.pb",
"--nologs" "--nologs"
], ],
"merge": { "merge": {
@ -147,7 +151,8 @@
"args": [ "args": [
"--android", "--android",
"--adb-path", "--adb-path",
"../../third_party/android_sdk/public/platform-tools/adb" "../../third_party/android_sdk/public/platform-tools/adb",
"--isolated-script-test-perf-output=${ISOLATED_OUTDIR}/perftest-output.pb"
], ],
"merge": { "merge": {
"args": [ "args": [
@ -179,6 +184,7 @@
}, },
{ {
"args": [ "args": [
"--isolated-script-test-perf-output=${ISOLATED_OUTDIR}/perftest-output.pb",
"--nologs" "--nologs"
], ],
"merge": { "merge": {
@ -217,7 +223,8 @@
"args": [ "args": [
"--android", "--android",
"--adb-path", "--adb-path",
"../../third_party/android_sdk/public/platform-tools/adb" "../../third_party/android_sdk/public/platform-tools/adb",
"--isolated-script-test-perf-output=${ISOLATED_OUTDIR}/perftest-output.pb"
], ],
"merge": { "merge": {
"args": [ "args": [
@ -248,6 +255,7 @@
}, },
{ {
"args": [ "args": [
"--isolated-script-test-perf-output=${ISOLATED_OUTDIR}/perftest-output.pb",
"--nologs" "--nologs"
], ],
"merge": { "merge": {

View file

@ -218,6 +218,13 @@
'args': ['--test-suite', 'low_bandwidth_audio_perf_test'] 'args': ['--test-suite', 'low_bandwidth_audio_perf_test']
} }
}, },
'perf-output': {
'$mixin_append': {
'args': [
'--isolated-script-test-perf-output=${ISOLATED_OUTDIR}/perftest-output.pb'
]
}
},
'perf-pool': { 'perf-pool': {
'swarming': { 'swarming': {
'dimensions': { 'dimensions': {

View file

@ -160,6 +160,13 @@
'args': ['--test-suite', 'low_bandwidth_audio_perf_test'], 'args': ['--test-suite', 'low_bandwidth_audio_perf_test'],
}, },
}, },
'perf-output': {
'$mixin_append': {
'args': [
'--isolated-script-test-perf-output=${ISOLATED_OUTDIR}/perftest-output.pb',
],
},
},
'perf-pool': { 'perf-pool': {
'swarming': { 'swarming': {
'dimensions': { 'dimensions': {

View file

@ -257,7 +257,7 @@
'Perf Android32 (M AOSP Nexus6)': { 'Perf Android32 (M AOSP Nexus6)': {
'mixins': [ 'mixins': [
'shamu', 'marshmallow_generic', 'android-devices', 'perf-pool', 'shamu', 'marshmallow_generic', 'android-devices', 'perf-pool',
'timeout-3h', 'has_native_resultdb_integration' 'perf-output', 'timeout-3h', 'has_native_resultdb_integration'
], ],
'test_suites': { 'test_suites': {
'gtest_tests': 'android_perf_tests', 'gtest_tests': 'android_perf_tests',
@ -266,7 +266,7 @@
'Perf Android32 (M Nexus5)': { 'Perf Android32 (M Nexus5)': {
'mixins': [ 'mixins': [
'hammerhead', 'marshmallow_generic', 'android-devices', 'perf-pool', 'hammerhead', 'marshmallow_generic', 'android-devices', 'perf-pool',
'timeout-3h', 'has_native_resultdb_integration' 'perf-output', 'timeout-3h', 'has_native_resultdb_integration'
], ],
'test_suites': { 'test_suites': {
'gtest_tests': 'android_perf_tests', 'gtest_tests': 'android_perf_tests',
@ -275,7 +275,7 @@
'Perf Android64 (M Nexus5X)': { 'Perf Android64 (M Nexus5X)': {
'mixins': [ 'mixins': [
'bullhead', 'marshmallow', 'android-devices', 'perf-pool', 'bullhead', 'marshmallow', 'android-devices', 'perf-pool',
'timeout-3h', 'has_native_resultdb_integration' 'perf-output', 'timeout-3h', 'has_native_resultdb_integration'
], ],
'test_suites': { 'test_suites': {
'gtest_tests': 'android_perf_tests', 'gtest_tests': 'android_perf_tests',
@ -284,7 +284,7 @@
'Perf Android64 (O Pixel2)': { 'Perf Android64 (O Pixel2)': {
'mixins': [ 'mixins': [
'walleye', 'android-devices', 'perf-pool', 'timeout-3h', 'walleye', 'android-devices', 'perf-pool', 'timeout-3h',
'has_native_resultdb_integration' 'perf-output', 'has_native_resultdb_integration'
], ],
'test_suites': { 'test_suites': {
'gtest_tests': 'android_perf_tests', 'gtest_tests': 'android_perf_tests',