Run webrtc_perf_tests on Fuchsia os.
Currently a specific target is running on Fuchsia which is a copy paste of webrtc_perf_tests.
Change-Id: Ib1fd5dc898f50c43f2bcd45e73c278d3547ce813
Bug: None
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/306963
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Jeremy Leconte <jleconte@google.com>
Cr-Commit-Position: refs/heads/main@{#40176}
diff --git a/BUILD.gn b/BUILD.gn
index d847605..3f3e496 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -110,9 +110,6 @@
if ((is_linux || is_chromeos) && rtc_use_pipewire) {
deps += [ "modules/desktop_capture:shared_screencast_stream_test" ]
}
- if (is_fuchsia) {
- deps += [ ":fuchsia_perf_tests" ]
- }
}
if (target_os == "android") {
deps += [ "tools_webrtc:binary_version_check" ]
@@ -734,24 +731,6 @@
}
}
- if (is_fuchsia) {
- rtc_test("fuchsia_perf_tests") {
- testonly = true
- deps = [
- #TODO(fxbug.dev/115601) - Enable when fixed
- "call:call_perf_tests",
- "modules/audio_coding:audio_coding_perf_tests",
- "modules/audio_processing:audio_processing_perf_tests",
- "pc:peerconnection_perf_tests",
- "test:test_main",
- "video:video_full_stack_tests",
- "video:video_pc_full_stack_tests",
- ]
-
- data = webrtc_perf_tests_resources
- }
- }
-
rtc_test("webrtc_nonparallel_tests") {
testonly = true
deps = [ "rtc_base:rtc_base_nonparallel_tests" ]
diff --git a/infra/specs/client.webrtc.perf.json b/infra/specs/client.webrtc.perf.json
index 10908fa..32ec37f 100644
--- a/infra/specs/client.webrtc.perf.json
+++ b/infra/specs/client.webrtc.perf.json
@@ -309,18 +309,18 @@
"--test-launcher-summary-output=${ISOLATED_OUTDIR}/gtest_output.json",
"--test-arg=--gtest_output=json:/custom_artifacts/gtest_output.json",
"--test-arg=--undefok=test_launcher_summary_output",
- "--nologs",
- "--isolated-script-test-perf-output=${ISOLATED_OUTDIR}/perftest-output.json"
+ "--isolated-script-test-perf-output=${ISOLATED_OUTDIR}/perftest-output.pb",
+ "--nologs"
],
- "isolate_name": "fuchsia_perf_tests",
+ "isolate_name": "webrtc_perf_tests",
"merge": {
"args": [
"--test-suite",
- "fuchsia_perf_tests"
+ "webrtc_perf_tests"
],
"script": "//tools_webrtc/perf/process_perf_results.py"
},
- "name": "fuchsia_perf_tests",
+ "name": "webrtc_perf_tests",
"resultdb": {
"result_file": "${ISOLATED_OUTDIR}/gtest_output.json",
"result_format": "gtest_json"
@@ -340,7 +340,7 @@
"idempotent": false,
"io_timeout": 10800
},
- "test_id_prefix": "ninja://:fuchsia_perf_tests/"
+ "test_id_prefix": "ninja://:webrtc_perf_tests/"
}
]
},
diff --git a/infra/specs/gn_isolate_map.pyl b/infra/specs/gn_isolate_map.pyl
index caca6a3..d50b536 100644
--- a/infra/specs/gn_isolate_map.pyl
+++ b/infra/specs/gn_isolate_map.pyl
@@ -63,10 +63,6 @@
"label": "//sdk/android:android_instrumentation_test_apk",
"type": "console_test_launcher",
},
- "fuchsia_perf_tests": {
- "label": "//:fuchsia_perf_tests",
- "type": "raw",
- },
"low_bandwidth_audio_test": {
"label": "//audio:low_bandwidth_audio_test",
"type": "console_test_launcher",
diff --git a/infra/specs/mixins.pyl b/infra/specs/mixins.pyl
index 2d7fcbb..2767f67 100644
--- a/infra/specs/mixins.pyl
+++ b/infra/specs/mixins.pyl
@@ -183,18 +183,6 @@
'args': ['--out-dir', '${ISOLATED_OUTDIR}']
}
},
- 'perf-fuchsia-perf-tests': {
- 'merge': {
- 'script': '//tools_webrtc/perf/process_perf_results.py',
- 'args': ['--test-suite', 'fuchsia_perf_tests']
- },
- '$mixin_append': {
- 'args': [
- '--nologs',
- '--isolated-script-test-perf-output=${ISOLATED_OUTDIR}/perftest-output.json'
- ]
- }
- },
'perf-output': {
'$mixin_append': {
'args': [
diff --git a/infra/specs/mixins_webrtc.pyl b/infra/specs/mixins_webrtc.pyl
index 3a7478f..e5810b9 100644
--- a/infra/specs/mixins_webrtc.pyl
+++ b/infra/specs/mixins_webrtc.pyl
@@ -96,18 +96,6 @@
}
}
},
- 'perf-fuchsia-perf-tests': {
- 'merge': {
- 'script': '//tools_webrtc/perf/process_perf_results.py',
- 'args': ['--test-suite', 'fuchsia_perf_tests'],
- },
- '$mixin_append': {
- 'args': [
- '--nologs',
- '--isolated-script-test-perf-output=${ISOLATED_OUTDIR}/perftest-output.json',
- ],
- },
- },
'perf-output': {
'$mixin_append': {
'args': [
diff --git a/infra/specs/test_suites.pyl b/infra/specs/test_suites.pyl
index 7963fbc..703ac34 100644
--- a/infra/specs/test_suites.pyl
+++ b/infra/specs/test_suites.pyl
@@ -107,13 +107,6 @@
'voip_unittests': {},
'webrtc_nonparallel_tests': {},
},
- 'fuchsia_compatible_perf_tests': {
- 'fuchsia_perf_tests': {
- 'mixins': [
- 'perf-fuchsia-perf-tests',
- ],
- },
- },
'fuchsia_compatible_tests': {
'audio_decoder_unittests': {},
'common_audio_unittests': {},
diff --git a/infra/specs/waterfalls.pyl b/infra/specs/waterfalls.pyl
index 78caceb..046a5b4 100644
--- a/infra/specs/waterfalls.pyl
+++ b/infra/specs/waterfalls.pyl
@@ -288,10 +288,10 @@
'linux',
'mixins': [
'linux-bionic', 'x86-64', 'perf-pool-vm', 'timeout-3h',
- 'resultdb-gtest-json-format', 'fuchsia-gtest-output'
+ 'resultdb-gtest-json-format', 'fuchsia-gtest-output', 'perf-output'
],
'test_suites': {
- 'isolated_scripts': 'fuchsia_compatible_perf_tests',
+ 'isolated_scripts': 'webrtc_perf_tests',
}
},
'Perf Linux Bionic': {
