Split resource_adaptation_tests and video_adaptation_tests This CL splits the large test libraries in `call/adaptation` and `video/adaptation` into individual `rtc_cc_test` targets for better parallelism. They are now aggregated in `rtc_test_suite` targets. Dependencies have been trimmed to the minimal required set for each target. Bug: webrtc:498394143 Change-Id: I2368049f88c3044c894987455b38a0426a6a6964 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/466800 Reviewed-by: Jeremy Leconte <jleconte@google.com> Commit-Queue: Evan Shrubsole <eshr@webrtc.org> Cr-Commit-Position: refs/heads/main@{#47548}
diff --git a/BUILD.gn b/BUILD.gn index 213ed9d..6ab23db 100644 --- a/BUILD.gn +++ b/BUILD.gn
@@ -133,8 +133,10 @@ deps = [ ":webrtc_nonparallel_tests", "//call:call_tests", + "//call/adaptation:resource_adaptation_tests", "//pc:peerconnection_unittests", "//test:test_support_unittests", + "//video/adaptation:video_adaptation_tests", ] } } @@ -729,11 +731,9 @@ rtc_test("video_engine_tests") { testonly = true deps = [ - "call/adaptation:resource_adaptation_tests", "test:test_common", "test:video_test_common", "video:video_tests", - "video/adaptation:video_adaptation_tests", ] data_deps = [ "resources:video_engine_tests_data" ]
diff --git a/call/adaptation/BUILD.gn b/call/adaptation/BUILD.gn index 0b0da34..5abc96f 100644 --- a/call/adaptation/BUILD.gn +++ b/call/adaptation/BUILD.gn
@@ -60,17 +60,19 @@ } if (rtc_include_tests) { - rtc_library("resource_adaptation_tests") { - testonly = true - - sources = [ - "broadcast_resource_listener_unittest.cc", - "resource_adaptation_processor_unittest.cc", - "resource_unittest.cc", - "video_source_restrictions_unittest.cc", - "video_stream_adapter_unittest.cc", - "video_stream_input_state_provider_unittest.cc", + rtc_cc_test("broadcast_resource_listener_unittest") { + sources = [ "broadcast_resource_listener_unittest.cc" ] + deps = [ + ":resource_adaptation", + ":resource_adaptation_test_utilities", + "../../api:scoped_refptr", + "../../api/adaptation:resource_adaptation_api", + "../../test:test_support", ] + } + + rtc_cc_test("resource_adaptation_processor_unittest") { + sources = [ "resource_adaptation_processor_unittest.cc" ] deps = [ ":resource_adaptation", ":resource_adaptation_test_utilities", @@ -81,22 +83,74 @@ "../../api/adaptation:resource_adaptation_api", "../../api/units:time_delta", "../../api/video:video_adaptation", - "../../api/video:video_frame", - "../../api/video_codecs:video_codecs_api", - "../../rtc_base:checks", "../../rtc_base:macromagic", "../../rtc_base:rtc_event", "../../rtc_base:task_queue_for_test", - "../../rtc_base:threading", "../../test:create_test_field_trials", "../../test:run_loop", "../../test:test_support", "../../test:wait_until", - "../../video/config:encoder_config", + ] + } + + rtc_cc_test("resource_unittest") { + sources = [ "resource_unittest.cc" ] + deps = [ + ":resource_adaptation_test_utilities", + "../../api:scoped_refptr", + "../../api/adaptation:resource_adaptation_api", + "../../test:test_support", + ] + } + + rtc_cc_test("video_source_restrictions_unittest") { + sources = [ "video_source_restrictions_unittest.cc" ] + deps = [ + ":resource_adaptation", + "../../test:test_support", + ] + } + + rtc_cc_test("video_stream_adapter_unittest") { + sources = [ "video_stream_adapter_unittest.cc" ] + deps = [ + ":resource_adaptation", + ":resource_adaptation_test_utilities", + "../../api:rtp_parameters", + "../../api:scoped_refptr", + "../../api/adaptation:resource_adaptation_api", + "../../api/video:video_adaptation", + "../../api/video_codecs:video_codecs_api", + "../../rtc_base:checks", + "../../test:create_test_field_trials", + "../../test:test_support", "//third_party/abseil-cpp/absl/strings", ] } + rtc_cc_test("video_stream_input_state_provider_unittest") { + sources = [ "video_stream_input_state_provider_unittest.cc" ] + deps = [ + ":resource_adaptation", + ":resource_adaptation_test_utilities", + "../../api/video:video_frame", + "../../api/video_codecs:video_codecs_api", + "../../test:test_support", + "../../video/config:encoder_config", + ] + } + + rtc_test_suite("resource_adaptation_tests") { + tests = [ + ":broadcast_resource_listener_unittest", + ":resource_adaptation_processor_unittest", + ":resource_unittest", + ":video_source_restrictions_unittest", + ":video_stream_adapter_unittest", + ":video_stream_input_state_provider_unittest", + ] + } + rtc_library("resource_adaptation_test_utilities") { testonly = true
diff --git a/infra/specs/client.webrtc.json b/infra/specs/client.webrtc.json index f92906f..fa89e38 100644 --- a/infra/specs/client.webrtc.json +++ b/infra/specs/client.webrtc.json
@@ -241,6 +241,27 @@ "merge": { "script": "//testing/merge_scripts/standard_gtest_merge.py" }, + "module_name": "//call/adaptation:resource_adaptation_tests", + "name": "resource_adaptation_tests", + "resultdb": { + "enable": true, + "has_native_resultdb_integration": true + }, + "swarming": { + "dimensions": { + "android_devices": "1", + "device_type": "walleye", + "os": "Android" + }, + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "resource_adaptation_tests", + "test_id_prefix": "ninja://call/adaptation:resource_adaptation_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, "module_name": "//media:rtc_media_unittests", "name": "rtc_media_unittests", "resultdb": { @@ -453,6 +474,27 @@ "merge": { "script": "//testing/merge_scripts/standard_gtest_merge.py" }, + "module_name": "//video/adaptation:video_adaptation_tests", + "name": "video_adaptation_tests", + "resultdb": { + "enable": true, + "has_native_resultdb_integration": true + }, + "swarming": { + "dimensions": { + "android_devices": "1", + "device_type": "walleye", + "os": "Android" + }, + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "video_adaptation_tests", + "test_id_prefix": "ninja://video/adaptation:video_adaptation_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, "module_name": "//:video_engine_tests", "name": "video_engine_tests", "resultdb": { @@ -823,6 +865,27 @@ "merge": { "script": "//testing/merge_scripts/standard_gtest_merge.py" }, + "module_name": "//call/adaptation:resource_adaptation_tests", + "name": "resource_adaptation_tests", + "resultdb": { + "enable": true, + "has_native_resultdb_integration": true + }, + "swarming": { + "dimensions": { + "android_devices": "1", + "device_type": "walleye", + "os": "Android" + }, + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "resource_adaptation_tests", + "test_id_prefix": "ninja://call/adaptation:resource_adaptation_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, "module_name": "//media:rtc_media_unittests", "name": "rtc_media_unittests", "resultdb": { @@ -1035,6 +1098,27 @@ "merge": { "script": "//testing/merge_scripts/standard_gtest_merge.py" }, + "module_name": "//video/adaptation:video_adaptation_tests", + "name": "video_adaptation_tests", + "resultdb": { + "enable": true, + "has_native_resultdb_integration": true + }, + "swarming": { + "dimensions": { + "android_devices": "1", + "device_type": "walleye", + "os": "Android" + }, + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "video_adaptation_tests", + "test_id_prefix": "ninja://video/adaptation:video_adaptation_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, "module_name": "//:video_engine_tests", "name": "video_engine_tests", "resultdb": { @@ -1434,6 +1518,27 @@ "merge": { "script": "//testing/merge_scripts/standard_gtest_merge.py" }, + "module_name": "//call/adaptation:resource_adaptation_tests", + "name": "resource_adaptation_tests", + "resultdb": { + "enable": true, + "has_native_resultdb_integration": true + }, + "swarming": { + "dimensions": { + "android_devices": "1", + "device_type": "walleye", + "os": "Android" + }, + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "resource_adaptation_tests", + "test_id_prefix": "ninja://call/adaptation:resource_adaptation_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, "module_name": "//media:rtc_media_unittests", "name": "rtc_media_unittests", "resultdb": { @@ -1646,6 +1751,27 @@ "merge": { "script": "//testing/merge_scripts/standard_gtest_merge.py" }, + "module_name": "//video/adaptation:video_adaptation_tests", + "name": "video_adaptation_tests", + "resultdb": { + "enable": true, + "has_native_resultdb_integration": true + }, + "swarming": { + "dimensions": { + "android_devices": "1", + "device_type": "walleye", + "os": "Android" + }, + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "video_adaptation_tests", + "test_id_prefix": "ninja://video/adaptation:video_adaptation_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, "module_name": "//:video_engine_tests", "name": "video_engine_tests", "resultdb": { @@ -2016,6 +2142,27 @@ "merge": { "script": "//testing/merge_scripts/standard_gtest_merge.py" }, + "module_name": "//call/adaptation:resource_adaptation_tests", + "name": "resource_adaptation_tests", + "resultdb": { + "enable": true, + "has_native_resultdb_integration": true + }, + "swarming": { + "dimensions": { + "android_devices": "1", + "device_type": "walleye", + "os": "Android" + }, + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "resource_adaptation_tests", + "test_id_prefix": "ninja://call/adaptation:resource_adaptation_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, "module_name": "//media:rtc_media_unittests", "name": "rtc_media_unittests", "resultdb": { @@ -2228,6 +2375,27 @@ "merge": { "script": "//testing/merge_scripts/standard_gtest_merge.py" }, + "module_name": "//video/adaptation:video_adaptation_tests", + "name": "video_adaptation_tests", + "resultdb": { + "enable": true, + "has_native_resultdb_integration": true + }, + "swarming": { + "dimensions": { + "android_devices": "1", + "device_type": "walleye", + "os": "Android" + }, + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "video_adaptation_tests", + "test_id_prefix": "ninja://video/adaptation:video_adaptation_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, "module_name": "//:video_engine_tests", "name": "video_engine_tests", "resultdb": { @@ -2498,6 +2666,31 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//call/adaptation:resource_adaptation_tests", + "name": "resource_adaptation_tests", + "resultdb": { + "result_file": "${ISOLATED_OUTDIR}/gtest_output.json", + "result_format": "gtest_json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Ubuntu-22.04" + } + }, + "test": "resource_adaptation_tests", + "test_id_prefix": "ninja://call/adaptation:resource_adaptation_tests/" + }, + { + "args": [ + "--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", + "--gtest_output=json:${ISOLATED_OUTDIR}/gtest_output.json" + ], + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//media:rtc_media_unittests", "name": "rtc_media_unittests", "resultdb": { @@ -2624,6 +2817,31 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//video/adaptation:video_adaptation_tests", + "name": "video_adaptation_tests", + "resultdb": { + "result_file": "${ISOLATED_OUTDIR}/gtest_output.json", + "result_format": "gtest_json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Ubuntu-22.04" + } + }, + "test": "video_adaptation_tests", + "test_id_prefix": "ninja://video/adaptation:video_adaptation_tests/" + }, + { + "args": [ + "--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", + "--gtest_output=json:${ISOLATED_OUTDIR}/gtest_output.json" + ], + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//:video_engine_tests", "name": "video_engine_tests", "resultdb": { @@ -2886,6 +3104,24 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//call/adaptation:resource_adaptation_tests", + "name": "resource_adaptation_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Ubuntu-22.04" + } + }, + "test": "resource_adaptation_tests", + "test_id_prefix": "ninja://call/adaptation:resource_adaptation_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//media:rtc_media_unittests", "name": "rtc_media_unittests", "resultdb": { @@ -3087,6 +3323,24 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//video/adaptation:video_adaptation_tests", + "name": "video_adaptation_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Ubuntu-22.04" + } + }, + "test": "video_adaptation_tests", + "test_id_prefix": "ninja://video/adaptation:video_adaptation_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//:video_engine_tests", "name": "video_engine_tests", "resultdb": { @@ -3329,6 +3583,24 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//call/adaptation:resource_adaptation_tests", + "name": "resource_adaptation_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Ubuntu-22.04" + } + }, + "test": "resource_adaptation_tests", + "test_id_prefix": "ninja://call/adaptation:resource_adaptation_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//media:rtc_media_unittests", "name": "rtc_media_unittests", "resultdb": { @@ -3530,6 +3802,24 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//video/adaptation:video_adaptation_tests", + "name": "video_adaptation_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Ubuntu-22.04" + } + }, + "test": "video_adaptation_tests", + "test_id_prefix": "ninja://video/adaptation:video_adaptation_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//:video_engine_tests", "name": "video_engine_tests", "resultdb": { @@ -3772,6 +4062,24 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//call/adaptation:resource_adaptation_tests", + "name": "resource_adaptation_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Ubuntu-22.04" + } + }, + "test": "resource_adaptation_tests", + "test_id_prefix": "ninja://call/adaptation:resource_adaptation_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//media:rtc_media_unittests", "name": "rtc_media_unittests", "resultdb": { @@ -3973,6 +4281,24 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//video/adaptation:video_adaptation_tests", + "name": "video_adaptation_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Ubuntu-22.04" + } + }, + "test": "video_adaptation_tests", + "test_id_prefix": "ninja://video/adaptation:video_adaptation_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//:video_engine_tests", "name": "video_engine_tests", "resultdb": { @@ -4215,6 +4541,24 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//call/adaptation:resource_adaptation_tests", + "name": "resource_adaptation_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Ubuntu-22.04" + } + }, + "test": "resource_adaptation_tests", + "test_id_prefix": "ninja://call/adaptation:resource_adaptation_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//media:rtc_media_unittests", "name": "rtc_media_unittests", "resultdb": { @@ -4416,6 +4760,24 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//video/adaptation:video_adaptation_tests", + "name": "video_adaptation_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Ubuntu-22.04" + } + }, + "test": "video_adaptation_tests", + "test_id_prefix": "ninja://video/adaptation:video_adaptation_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//:video_engine_tests", "name": "video_engine_tests", "resultdb": { @@ -4658,6 +5020,24 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//call/adaptation:resource_adaptation_tests", + "name": "resource_adaptation_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Ubuntu-22.04" + } + }, + "test": "resource_adaptation_tests", + "test_id_prefix": "ninja://call/adaptation:resource_adaptation_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//media:rtc_media_unittests", "name": "rtc_media_unittests", "resultdb": { @@ -4859,6 +5239,24 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//video/adaptation:video_adaptation_tests", + "name": "video_adaptation_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Ubuntu-22.04" + } + }, + "test": "video_adaptation_tests", + "test_id_prefix": "ninja://video/adaptation:video_adaptation_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//:video_engine_tests", "name": "video_engine_tests", "resultdb": { @@ -5101,6 +5499,24 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//call/adaptation:resource_adaptation_tests", + "name": "resource_adaptation_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Ubuntu-22.04" + } + }, + "test": "resource_adaptation_tests", + "test_id_prefix": "ninja://call/adaptation:resource_adaptation_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//media:rtc_media_unittests", "name": "rtc_media_unittests", "resultdb": { @@ -5284,6 +5700,24 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//video/adaptation:video_adaptation_tests", + "name": "video_adaptation_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Ubuntu-22.04" + } + }, + "test": "video_adaptation_tests", + "test_id_prefix": "ninja://video/adaptation:video_adaptation_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//:video_engine_tests", "name": "video_engine_tests", "resultdb": { @@ -5527,6 +5961,24 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//call/adaptation:resource_adaptation_tests", + "name": "resource_adaptation_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Ubuntu-22.04" + } + }, + "test": "resource_adaptation_tests", + "test_id_prefix": "ninja://call/adaptation:resource_adaptation_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//media:rtc_media_unittests", "name": "rtc_media_unittests", "resultdb": { @@ -5710,6 +6162,24 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//video/adaptation:video_adaptation_tests", + "name": "video_adaptation_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Ubuntu-22.04" + } + }, + "test": "video_adaptation_tests", + "test_id_prefix": "ninja://video/adaptation:video_adaptation_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//:video_engine_tests", "name": "video_engine_tests", "resultdb": { @@ -5954,6 +6424,24 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//call/adaptation:resource_adaptation_tests", + "name": "resource_adaptation_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Ubuntu-22.04" + } + }, + "test": "resource_adaptation_tests", + "test_id_prefix": "ninja://call/adaptation:resource_adaptation_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//media:rtc_media_unittests", "name": "rtc_media_unittests", "resultdb": { @@ -6155,6 +6643,24 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//video/adaptation:video_adaptation_tests", + "name": "video_adaptation_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Ubuntu-22.04" + } + }, + "test": "video_adaptation_tests", + "test_id_prefix": "ninja://video/adaptation:video_adaptation_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//:video_engine_tests", "name": "video_engine_tests", "resultdb": { @@ -6398,6 +6904,24 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//call/adaptation:resource_adaptation_tests", + "name": "resource_adaptation_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Ubuntu-22.04" + } + }, + "test": "resource_adaptation_tests", + "test_id_prefix": "ninja://call/adaptation:resource_adaptation_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//media:rtc_media_unittests", "name": "rtc_media_unittests", "resultdb": { @@ -6599,6 +7123,24 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//video/adaptation:video_adaptation_tests", + "name": "video_adaptation_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Ubuntu-22.04" + } + }, + "test": "video_adaptation_tests", + "test_id_prefix": "ninja://video/adaptation:video_adaptation_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//:video_engine_tests", "name": "video_engine_tests", "resultdb": { @@ -6852,6 +7394,25 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//call/adaptation:resource_adaptation_tests", + "name": "resource_adaptation_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cores": "12", + "cpu": "x86-64", + "os": "Mac-15" + } + }, + "test": "resource_adaptation_tests", + "test_id_prefix": "ninja://call/adaptation:resource_adaptation_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//media:rtc_media_unittests", "name": "rtc_media_unittests", "resultdb": { @@ -7045,6 +7606,25 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//video/adaptation:video_adaptation_tests", + "name": "video_adaptation_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cores": "12", + "cpu": "x86-64", + "os": "Mac-15" + } + }, + "test": "video_adaptation_tests", + "test_id_prefix": "ninja://video/adaptation:video_adaptation_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//:video_engine_tests", "name": "video_engine_tests", "resultdb": { @@ -7300,6 +7880,25 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//call/adaptation:resource_adaptation_tests", + "name": "resource_adaptation_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cores": "12", + "cpu": "x86-64", + "os": "Mac-15" + } + }, + "test": "resource_adaptation_tests", + "test_id_prefix": "ninja://call/adaptation:resource_adaptation_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//media:rtc_media_unittests", "name": "rtc_media_unittests", "resultdb": { @@ -7493,6 +8092,25 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//video/adaptation:video_adaptation_tests", + "name": "video_adaptation_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cores": "12", + "cpu": "x86-64", + "os": "Mac-15" + } + }, + "test": "video_adaptation_tests", + "test_id_prefix": "ninja://video/adaptation:video_adaptation_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//:video_engine_tests", "name": "video_engine_tests", "resultdb": { @@ -7739,6 +8357,24 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//call/adaptation:resource_adaptation_tests", + "name": "resource_adaptation_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Mac-15" + } + }, + "test": "resource_adaptation_tests", + "test_id_prefix": "ninja://call/adaptation:resource_adaptation_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//media:rtc_media_unittests", "name": "rtc_media_unittests", "resultdb": { @@ -7922,6 +8558,24 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//video/adaptation:video_adaptation_tests", + "name": "video_adaptation_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Mac-15" + } + }, + "test": "video_adaptation_tests", + "test_id_prefix": "ninja://video/adaptation:video_adaptation_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//:video_engine_tests", "name": "video_engine_tests", "resultdb": { @@ -8164,6 +8818,24 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//call/adaptation:resource_adaptation_tests", + "name": "resource_adaptation_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "arm64-64-Apple_M1", + "os": "Mac-15" + } + }, + "test": "resource_adaptation_tests", + "test_id_prefix": "ninja://call/adaptation:resource_adaptation_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//media:rtc_media_unittests", "name": "rtc_media_unittests", "resultdb": { @@ -8347,6 +9019,24 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//video/adaptation:video_adaptation_tests", + "name": "video_adaptation_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "arm64-64-Apple_M1", + "os": "Mac-15" + } + }, + "test": "video_adaptation_tests", + "test_id_prefix": "ninja://video/adaptation:video_adaptation_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//:video_engine_tests", "name": "video_engine_tests", "resultdb": { @@ -8615,6 +9305,24 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//call/adaptation:resource_adaptation_tests", + "name": "resource_adaptation_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Windows-10-19045" + } + }, + "test": "resource_adaptation_tests", + "test_id_prefix": "ninja://call/adaptation:resource_adaptation_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//media:rtc_media_unittests", "name": "rtc_media_unittests", "resultdb": { @@ -8798,6 +9506,24 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//video/adaptation:video_adaptation_tests", + "name": "video_adaptation_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Windows-10-19045" + } + }, + "test": "video_adaptation_tests", + "test_id_prefix": "ninja://video/adaptation:video_adaptation_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//:video_engine_tests", "name": "video_engine_tests", "resultdb": { @@ -9040,6 +9766,24 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//call/adaptation:resource_adaptation_tests", + "name": "resource_adaptation_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Windows-10-19045" + } + }, + "test": "resource_adaptation_tests", + "test_id_prefix": "ninja://call/adaptation:resource_adaptation_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//media:rtc_media_unittests", "name": "rtc_media_unittests", "resultdb": { @@ -9223,6 +9967,24 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//video/adaptation:video_adaptation_tests", + "name": "video_adaptation_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Windows-10-19045" + } + }, + "test": "video_adaptation_tests", + "test_id_prefix": "ninja://video/adaptation:video_adaptation_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//:video_engine_tests", "name": "video_engine_tests", "resultdb": { @@ -9465,6 +10227,24 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//call/adaptation:resource_adaptation_tests", + "name": "resource_adaptation_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Windows-10-19045" + } + }, + "test": "resource_adaptation_tests", + "test_id_prefix": "ninja://call/adaptation:resource_adaptation_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//media:rtc_media_unittests", "name": "rtc_media_unittests", "resultdb": { @@ -9648,6 +10428,24 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//video/adaptation:video_adaptation_tests", + "name": "video_adaptation_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Windows-10-19045" + } + }, + "test": "video_adaptation_tests", + "test_id_prefix": "ninja://video/adaptation:video_adaptation_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//:video_engine_tests", "name": "video_engine_tests", "resultdb": { @@ -9890,6 +10688,24 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//call/adaptation:resource_adaptation_tests", + "name": "resource_adaptation_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Windows-10-19045" + } + }, + "test": "resource_adaptation_tests", + "test_id_prefix": "ninja://call/adaptation:resource_adaptation_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//media:rtc_media_unittests", "name": "rtc_media_unittests", "resultdb": { @@ -10073,6 +10889,24 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//video/adaptation:video_adaptation_tests", + "name": "video_adaptation_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Windows-10-19045" + } + }, + "test": "video_adaptation_tests", + "test_id_prefix": "ninja://video/adaptation:video_adaptation_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//:video_engine_tests", "name": "video_engine_tests", "resultdb": { @@ -11051,6 +11885,104 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//call/adaptation:resource_adaptation_tests", + "name": "resource_adaptation_tests iPhone 14 17.5", + "resultdb": { + "enable": true, + "has_native_resultdb_integration": true + }, + "swarming": { + "cipd_packages": [ + { + "cipd_package": "infra/tools/mac_toolchain/${platform}", + "location": ".", + "revision": "git_revision:4c7290150d1c360cecc6a93c0214dc531585c3ab" + } + ], + "dimensions": { + "cpu": "arm64", + "os": "Mac-15" + }, + "named_caches": [ + { + "name": "runtime_ios_17_5", + "path": "Runtime-ios-17.5" + }, + { + "name": "xcode_ios_17a400", + "path": "Xcode.app" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "resource_adaptation_tests", + "test_id_prefix": "ninja://call/adaptation:resource_adaptation_tests/", + "variant_id": "iPhone 14 17.5" + }, + { + "args": [ + "--platform", + "iPhone 15", + "--version", + "18.2", + "--xcode-build-version", + "17a400", + "--out-dir", + "${ISOLATED_OUTDIR}", + "--xctest" + ], + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, + "module_name": "//call/adaptation:resource_adaptation_tests", + "name": "resource_adaptation_tests iPhone 15 18.2", + "resultdb": { + "enable": true, + "has_native_resultdb_integration": true + }, + "swarming": { + "cipd_packages": [ + { + "cipd_package": "infra/tools/mac_toolchain/${platform}", + "location": ".", + "revision": "git_revision:4c7290150d1c360cecc6a93c0214dc531585c3ab" + } + ], + "dimensions": { + "cpu": "arm64", + "os": "Mac-15" + }, + "named_caches": [ + { + "name": "runtime_ios_18_2", + "path": "Runtime-ios-18.2" + }, + { + "name": "xcode_ios_17a400", + "path": "Xcode.app" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "resource_adaptation_tests", + "test_id_prefix": "ninja://call/adaptation:resource_adaptation_tests/", + "variant_id": "iPhone 15 18.2" + }, + { + "args": [ + "--platform", + "iPhone 14", + "--version", + "17.5", + "--xcode-build-version", + "17a400", + "--out-dir", + "${ISOLATED_OUTDIR}", + "--xctest" + ], + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//media:rtc_media_unittests", "name": "rtc_media_unittests iPhone 14 17.5", "resultdb": { @@ -12039,6 +12971,104 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//video/adaptation:video_adaptation_tests", + "name": "video_adaptation_tests iPhone 14 17.5", + "resultdb": { + "enable": true, + "has_native_resultdb_integration": true + }, + "swarming": { + "cipd_packages": [ + { + "cipd_package": "infra/tools/mac_toolchain/${platform}", + "location": ".", + "revision": "git_revision:4c7290150d1c360cecc6a93c0214dc531585c3ab" + } + ], + "dimensions": { + "cpu": "arm64", + "os": "Mac-15" + }, + "named_caches": [ + { + "name": "runtime_ios_17_5", + "path": "Runtime-ios-17.5" + }, + { + "name": "xcode_ios_17a400", + "path": "Xcode.app" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "video_adaptation_tests", + "test_id_prefix": "ninja://video/adaptation:video_adaptation_tests/", + "variant_id": "iPhone 14 17.5" + }, + { + "args": [ + "--platform", + "iPhone 15", + "--version", + "18.2", + "--xcode-build-version", + "17a400", + "--out-dir", + "${ISOLATED_OUTDIR}", + "--xctest" + ], + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, + "module_name": "//video/adaptation:video_adaptation_tests", + "name": "video_adaptation_tests iPhone 15 18.2", + "resultdb": { + "enable": true, + "has_native_resultdb_integration": true + }, + "swarming": { + "cipd_packages": [ + { + "cipd_package": "infra/tools/mac_toolchain/${platform}", + "location": ".", + "revision": "git_revision:4c7290150d1c360cecc6a93c0214dc531585c3ab" + } + ], + "dimensions": { + "cpu": "arm64", + "os": "Mac-15" + }, + "named_caches": [ + { + "name": "runtime_ios_18_2", + "path": "Runtime-ios-18.2" + }, + { + "name": "xcode_ios_17a400", + "path": "Xcode.app" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "video_adaptation_tests", + "test_id_prefix": "ninja://video/adaptation:video_adaptation_tests/", + "variant_id": "iPhone 15 18.2" + }, + { + "args": [ + "--platform", + "iPhone 14", + "--version", + "17.5", + "--xcode-build-version", + "17a400", + "--out-dir", + "${ISOLATED_OUTDIR}", + "--xctest" + ], + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//:video_engine_tests", "name": "video_engine_tests iPhone 14 17.5", "resultdb": {
diff --git a/infra/specs/gn_isolate_map.pyl b/infra/specs/gn_isolate_map.pyl index a0ac3fc..4b5dc18 100644 --- a/infra/specs/gn_isolate_map.pyl +++ b/infra/specs/gn_isolate_map.pyl
@@ -51,6 +51,18 @@ "label": "//call:call_tests", "type": "console_test_launcher", }, + "resource_adaptation_tests": { + "label": "//call/adaptation:resource_adaptation_tests", + "type": "console_test_launcher", + }, + "video_adaptation_tests": { + "label": "//video/adaptation:video_adaptation_tests", + "type": "console_test_launcher", + }, + "video_tests": { + "label": "//video:video_tests", + "type": "console_test_launcher", + }, "common_audio_unittests": { "label": "//common_audio:common_audio_unittests", "type": "console_test_launcher",
diff --git a/infra/specs/test_suites.pyl b/infra/specs/test_suites.pyl index 4d813ae..45e408f 100644 --- a/infra/specs/test_suites.pyl +++ b/infra/specs/test_suites.pyl
@@ -19,6 +19,7 @@ 'android_sdk_junit_tests': {}, }, 'android_tests': { + # keep-sorted start block=yes 'AppRTCMobile_test_apk': {}, 'android_instrumentation_test_apk': {}, 'audio_decoder_unittests': {}, @@ -36,6 +37,7 @@ 'peerconnection_unittests': { 'mixins': ['shards-4'], }, + 'resource_adaptation_tests': {}, 'rtc_media_unittests': {}, 'rtc_p2p_unittests': {}, 'rtc_pc_unittests': {}, @@ -51,12 +53,14 @@ 'system_wrappers_unittests': {}, 'test_support_unittests': {}, 'tools_unittests': {}, + 'video_adaptation_tests': {}, 'video_engine_tests': { 'mixins': ['shards-4'], }, 'video_timing_tests': {}, 'voip_unittests': {}, 'webrtc_nonparallel_tests': {}, + # keep-sorted end }, 'android_tests_tryserver_specific': { 'video_codec_perf_tests': { @@ -67,6 +71,7 @@ } }, 'desktop_tests': { + # keep-sorted start block=yes 'audio_decoder_unittests': {}, 'audio_engine_tests': {}, 'call_tests': {}, @@ -82,6 +87,7 @@ 'peerconnection_unittests': { 'mixins': ['shards-4'], }, + 'resource_adaptation_tests': {}, 'rtc_media_unittests': {}, 'rtc_p2p_unittests': {}, 'rtc_pc_unittests': {}, @@ -98,12 +104,14 @@ 'mixins': ['shards-2'], }, 'tools_unittests': {}, + 'video_adaptation_tests': {}, 'video_engine_tests': { 'mixins': ['shards-4'], }, 'video_timing_tests': {}, 'voip_unittests': {}, 'webrtc_nonparallel_tests': {}, + # keep-sorted end }, 'desktop_tests_linux_specific': { 'shared_screencast_stream_test': {}, @@ -119,28 +127,30 @@ } }, 'fuchsia_compatible_tests': { + # keep-sorted start block=yes 'audio_decoder_unittests': {}, 'call_tests': {}, 'common_audio_unittests': {}, 'common_video_unittests': {}, 'dcsctp_unittests': {}, + 'resource_adaptation_tests': {}, 'rtc_media_unittests': {}, - # TODO(bugs.webrtc.org/14705): Enable when NonGlobalFieldTrialsInstanceDoesNotModifyGlobalString is fixed. - # TODO(bugs.webrtc.org/14700): Enable when NetworkTest tests are fixed. - # 'rtc_unittests': {}, 'rtc_p2p_unittests': {}, 'rtc_pc_unittests': {}, 'svc_tests': { 'mixins': ['shards-4'], }, 'system_wrappers_unittests': {}, - # TODO(bugs.webrtc.org/14712): Enable once network issue is fixed. - # 'peerconnection_unittests': {}, + 'video_adaptation_tests': {}, 'video_engine_tests': { 'mixins': ['shards-4'], }, 'voip_unittests': {}, 'webrtc_nonparallel_tests': {}, + # keep-sorted end + # TODO(bugs.webrtc.org/14705): Enable when NonGlobalFieldTrialsInstanceDoesNotModifyGlobalString is fixed. + # TODO(bugs.webrtc.org/14700): Enable when NetworkTest tests are fixed. + # 'rtc_unittests': {}, # TODO(bugs.fuchsia.dev/115601): Enable when cpu time API's are implemented in Fuchsia # 'test_support_unittests': {}, # TODO(bugs.webrtc.org/14707): chromium.test component needs to allow creating listening ports. @@ -148,6 +158,7 @@ # }, 'ios_simulator_tests': { + # keep-sorted start block=yes 'apprtcmobile_tests': { 'mixins': ['xcodebuild_sim_runner'] }, @@ -163,6 +174,7 @@ 'modules_unittests': { 'mixins': ['shards-6', 'cores-12'], }, + 'resource_adaptation_tests': {}, 'rtc_media_unittests': {}, 'rtc_p2p_unittests': {}, 'rtc_pc_unittests': {}, @@ -183,12 +195,14 @@ 'system_wrappers_unittests': {}, 'test_support_unittests': {}, 'tools_unittests': {}, + 'video_adaptation_tests': {}, 'video_engine_tests': { 'mixins': ['shards-4'], }, 'video_timing_tests': {}, 'voip_unittests': {}, 'webrtc_nonparallel_tests': {}, + # keep-sorted end }, 'more_configs_tests': { 'peerconnection_unittests': {
diff --git a/infra/specs/tryserver.webrtc.json b/infra/specs/tryserver.webrtc.json index 1c47335..dffc561 100644 --- a/infra/specs/tryserver.webrtc.json +++ b/infra/specs/tryserver.webrtc.json
@@ -241,6 +241,27 @@ "merge": { "script": "//testing/merge_scripts/standard_gtest_merge.py" }, + "module_name": "//call/adaptation:resource_adaptation_tests", + "name": "resource_adaptation_tests", + "resultdb": { + "enable": true, + "has_native_resultdb_integration": true + }, + "swarming": { + "dimensions": { + "android_devices": "1", + "device_type": "walleye", + "os": "Android" + }, + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "resource_adaptation_tests", + "test_id_prefix": "ninja://call/adaptation:resource_adaptation_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, "module_name": "//media:rtc_media_unittests", "name": "rtc_media_unittests", "resultdb": { @@ -450,6 +471,27 @@ "test_id_prefix": "ninja://rtc_tools:tools_unittests/" }, { + "merge": { + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, + "module_name": "//video/adaptation:video_adaptation_tests", + "name": "video_adaptation_tests", + "resultdb": { + "enable": true, + "has_native_resultdb_integration": true + }, + "swarming": { + "dimensions": { + "android_devices": "1", + "device_type": "walleye", + "os": "Android" + }, + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "video_adaptation_tests", + "test_id_prefix": "ninja://video/adaptation:video_adaptation_tests/" + }, + { "args": [ "--webrtc_quick_perf_test", "--nologs" @@ -874,6 +916,27 @@ "merge": { "script": "//testing/merge_scripts/standard_gtest_merge.py" }, + "module_name": "//call/adaptation:resource_adaptation_tests", + "name": "resource_adaptation_tests", + "resultdb": { + "enable": true, + "has_native_resultdb_integration": true + }, + "swarming": { + "dimensions": { + "android_devices": "1", + "device_type": "walleye", + "os": "Android" + }, + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "resource_adaptation_tests", + "test_id_prefix": "ninja://call/adaptation:resource_adaptation_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, "module_name": "//media:rtc_media_unittests", "name": "rtc_media_unittests", "resultdb": { @@ -1083,6 +1146,27 @@ "test_id_prefix": "ninja://rtc_tools:tools_unittests/" }, { + "merge": { + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, + "module_name": "//video/adaptation:video_adaptation_tests", + "name": "video_adaptation_tests", + "resultdb": { + "enable": true, + "has_native_resultdb_integration": true + }, + "swarming": { + "dimensions": { + "android_devices": "1", + "device_type": "walleye", + "os": "Android" + }, + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "video_adaptation_tests", + "test_id_prefix": "ninja://video/adaptation:video_adaptation_tests/" + }, + { "args": [ "--webrtc_quick_perf_test", "--nologs" @@ -1507,6 +1591,27 @@ "merge": { "script": "//testing/merge_scripts/standard_gtest_merge.py" }, + "module_name": "//call/adaptation:resource_adaptation_tests", + "name": "resource_adaptation_tests", + "resultdb": { + "enable": true, + "has_native_resultdb_integration": true + }, + "swarming": { + "dimensions": { + "android_devices": "1", + "device_type": "walleye", + "os": "Android" + }, + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "resource_adaptation_tests", + "test_id_prefix": "ninja://call/adaptation:resource_adaptation_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, "module_name": "//media:rtc_media_unittests", "name": "rtc_media_unittests", "resultdb": { @@ -1716,6 +1821,27 @@ "test_id_prefix": "ninja://rtc_tools:tools_unittests/" }, { + "merge": { + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, + "module_name": "//video/adaptation:video_adaptation_tests", + "name": "video_adaptation_tests", + "resultdb": { + "enable": true, + "has_native_resultdb_integration": true + }, + "swarming": { + "dimensions": { + "android_devices": "1", + "device_type": "walleye", + "os": "Android" + }, + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "video_adaptation_tests", + "test_id_prefix": "ninja://video/adaptation:video_adaptation_tests/" + }, + { "args": [ "--webrtc_quick_perf_test", "--nologs" @@ -2166,6 +2292,27 @@ "merge": { "script": "//testing/merge_scripts/standard_gtest_merge.py" }, + "module_name": "//call/adaptation:resource_adaptation_tests", + "name": "resource_adaptation_tests", + "resultdb": { + "enable": true, + "has_native_resultdb_integration": true + }, + "swarming": { + "dimensions": { + "android_devices": "1", + "device_type": "walleye", + "os": "Android" + }, + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "resource_adaptation_tests", + "test_id_prefix": "ninja://call/adaptation:resource_adaptation_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, "module_name": "//media:rtc_media_unittests", "name": "rtc_media_unittests", "resultdb": { @@ -2375,6 +2522,27 @@ "test_id_prefix": "ninja://rtc_tools:tools_unittests/" }, { + "merge": { + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, + "module_name": "//video/adaptation:video_adaptation_tests", + "name": "video_adaptation_tests", + "resultdb": { + "enable": true, + "has_native_resultdb_integration": true + }, + "swarming": { + "dimensions": { + "android_devices": "1", + "device_type": "walleye", + "os": "Android" + }, + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "video_adaptation_tests", + "test_id_prefix": "ninja://video/adaptation:video_adaptation_tests/" + }, + { "args": [ "--webrtc_quick_perf_test", "--nologs" @@ -2704,6 +2872,31 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//call/adaptation:resource_adaptation_tests", + "name": "resource_adaptation_tests", + "resultdb": { + "result_file": "${ISOLATED_OUTDIR}/gtest_output.json", + "result_format": "gtest_json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Ubuntu-22.04" + } + }, + "test": "resource_adaptation_tests", + "test_id_prefix": "ninja://call/adaptation:resource_adaptation_tests/" + }, + { + "args": [ + "--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", + "--gtest_output=json:${ISOLATED_OUTDIR}/gtest_output.json" + ], + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//media:rtc_media_unittests", "name": "rtc_media_unittests", "resultdb": { @@ -2830,6 +3023,31 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//video/adaptation:video_adaptation_tests", + "name": "video_adaptation_tests", + "resultdb": { + "result_file": "${ISOLATED_OUTDIR}/gtest_output.json", + "result_format": "gtest_json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Ubuntu-22.04" + } + }, + "test": "video_adaptation_tests", + "test_id_prefix": "ninja://video/adaptation:video_adaptation_tests/" + }, + { + "args": [ + "--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", + "--gtest_output=json:${ISOLATED_OUTDIR}/gtest_output.json" + ], + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//:video_engine_tests", "name": "video_engine_tests", "resultdb": { @@ -3807,6 +4025,104 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//call/adaptation:resource_adaptation_tests", + "name": "resource_adaptation_tests iPhone 14 17.5", + "resultdb": { + "enable": true, + "has_native_resultdb_integration": true + }, + "swarming": { + "cipd_packages": [ + { + "cipd_package": "infra/tools/mac_toolchain/${platform}", + "location": ".", + "revision": "git_revision:4c7290150d1c360cecc6a93c0214dc531585c3ab" + } + ], + "dimensions": { + "cpu": "arm64", + "os": "Mac-15" + }, + "named_caches": [ + { + "name": "runtime_ios_17_5", + "path": "Runtime-ios-17.5" + }, + { + "name": "xcode_ios_17a400", + "path": "Xcode.app" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "resource_adaptation_tests", + "test_id_prefix": "ninja://call/adaptation:resource_adaptation_tests/", + "variant_id": "iPhone 14 17.5" + }, + { + "args": [ + "--platform", + "iPhone 15", + "--version", + "18.2", + "--xcode-build-version", + "17a400", + "--out-dir", + "${ISOLATED_OUTDIR}", + "--xctest" + ], + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, + "module_name": "//call/adaptation:resource_adaptation_tests", + "name": "resource_adaptation_tests iPhone 15 18.2", + "resultdb": { + "enable": true, + "has_native_resultdb_integration": true + }, + "swarming": { + "cipd_packages": [ + { + "cipd_package": "infra/tools/mac_toolchain/${platform}", + "location": ".", + "revision": "git_revision:4c7290150d1c360cecc6a93c0214dc531585c3ab" + } + ], + "dimensions": { + "cpu": "arm64", + "os": "Mac-15" + }, + "named_caches": [ + { + "name": "runtime_ios_18_2", + "path": "Runtime-ios-18.2" + }, + { + "name": "xcode_ios_17a400", + "path": "Xcode.app" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "resource_adaptation_tests", + "test_id_prefix": "ninja://call/adaptation:resource_adaptation_tests/", + "variant_id": "iPhone 15 18.2" + }, + { + "args": [ + "--platform", + "iPhone 14", + "--version", + "17.5", + "--xcode-build-version", + "17a400", + "--out-dir", + "${ISOLATED_OUTDIR}", + "--xctest" + ], + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//media:rtc_media_unittests", "name": "rtc_media_unittests iPhone 14 17.5", "resultdb": { @@ -4795,6 +5111,104 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//video/adaptation:video_adaptation_tests", + "name": "video_adaptation_tests iPhone 14 17.5", + "resultdb": { + "enable": true, + "has_native_resultdb_integration": true + }, + "swarming": { + "cipd_packages": [ + { + "cipd_package": "infra/tools/mac_toolchain/${platform}", + "location": ".", + "revision": "git_revision:4c7290150d1c360cecc6a93c0214dc531585c3ab" + } + ], + "dimensions": { + "cpu": "arm64", + "os": "Mac-15" + }, + "named_caches": [ + { + "name": "runtime_ios_17_5", + "path": "Runtime-ios-17.5" + }, + { + "name": "xcode_ios_17a400", + "path": "Xcode.app" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "video_adaptation_tests", + "test_id_prefix": "ninja://video/adaptation:video_adaptation_tests/", + "variant_id": "iPhone 14 17.5" + }, + { + "args": [ + "--platform", + "iPhone 15", + "--version", + "18.2", + "--xcode-build-version", + "17a400", + "--out-dir", + "${ISOLATED_OUTDIR}", + "--xctest" + ], + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, + "module_name": "//video/adaptation:video_adaptation_tests", + "name": "video_adaptation_tests iPhone 15 18.2", + "resultdb": { + "enable": true, + "has_native_resultdb_integration": true + }, + "swarming": { + "cipd_packages": [ + { + "cipd_package": "infra/tools/mac_toolchain/${platform}", + "location": ".", + "revision": "git_revision:4c7290150d1c360cecc6a93c0214dc531585c3ab" + } + ], + "dimensions": { + "cpu": "arm64", + "os": "Mac-15" + }, + "named_caches": [ + { + "name": "runtime_ios_18_2", + "path": "Runtime-ios-18.2" + }, + { + "name": "xcode_ios_17a400", + "path": "Xcode.app" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "video_adaptation_tests", + "test_id_prefix": "ninja://video/adaptation:video_adaptation_tests/", + "variant_id": "iPhone 15 18.2" + }, + { + "args": [ + "--platform", + "iPhone 14", + "--version", + "17.5", + "--xcode-build-version", + "17a400", + "--out-dir", + "${ISOLATED_OUTDIR}", + "--xctest" + ], + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//:video_engine_tests", "name": "video_engine_tests iPhone 14 17.5", "resultdb": { @@ -5348,6 +5762,24 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//call/adaptation:resource_adaptation_tests", + "name": "resource_adaptation_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Ubuntu-22.04" + } + }, + "test": "resource_adaptation_tests", + "test_id_prefix": "ninja://call/adaptation:resource_adaptation_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//media:rtc_media_unittests", "name": "rtc_media_unittests", "resultdb": { @@ -5549,6 +5981,24 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//video/adaptation:video_adaptation_tests", + "name": "video_adaptation_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Ubuntu-22.04" + } + }, + "test": "video_adaptation_tests", + "test_id_prefix": "ninja://video/adaptation:video_adaptation_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//:video_engine_tests", "name": "video_engine_tests", "resultdb": { @@ -5807,6 +6257,25 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//call/adaptation:resource_adaptation_tests", + "name": "resource_adaptation_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Ubuntu-22.04" + } + }, + "test": "resource_adaptation_tests", + "test_id_prefix": "ninja://call/adaptation:resource_adaptation_tests/" + }, + { + "isolate_profile_data": true, + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//media:rtc_media_unittests", "name": "rtc_media_unittests", "resultdb": { @@ -6015,6 +6484,25 @@ "test_id_prefix": "ninja://rtc_tools:tools_unittests/" }, { + "isolate_profile_data": true, + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, + "module_name": "//video/adaptation:video_adaptation_tests", + "name": "video_adaptation_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Ubuntu-22.04" + } + }, + "test": "video_adaptation_tests", + "test_id_prefix": "ninja://video/adaptation:video_adaptation_tests/" + }, + { "args": [ "--webrtc_quick_perf_test", "--nologs", @@ -6314,6 +6802,24 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//call/adaptation:resource_adaptation_tests", + "name": "resource_adaptation_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Ubuntu-22.04" + } + }, + "test": "resource_adaptation_tests", + "test_id_prefix": "ninja://call/adaptation:resource_adaptation_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//media:rtc_media_unittests", "name": "rtc_media_unittests", "resultdb": { @@ -6515,6 +7021,24 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//video/adaptation:video_adaptation_tests", + "name": "video_adaptation_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Ubuntu-22.04" + } + }, + "test": "video_adaptation_tests", + "test_id_prefix": "ninja://video/adaptation:video_adaptation_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//:video_engine_tests", "name": "video_engine_tests", "resultdb": { @@ -6781,6 +7305,24 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//call/adaptation:resource_adaptation_tests", + "name": "resource_adaptation_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Ubuntu-22.04" + } + }, + "test": "resource_adaptation_tests", + "test_id_prefix": "ninja://call/adaptation:resource_adaptation_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//media:rtc_media_unittests", "name": "rtc_media_unittests", "resultdb": { @@ -6982,6 +7524,24 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//video/adaptation:video_adaptation_tests", + "name": "video_adaptation_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Ubuntu-22.04" + } + }, + "test": "video_adaptation_tests", + "test_id_prefix": "ninja://video/adaptation:video_adaptation_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//:video_engine_tests", "name": "video_engine_tests", "resultdb": { @@ -7224,6 +7784,24 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//call/adaptation:resource_adaptation_tests", + "name": "resource_adaptation_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Ubuntu-22.04" + } + }, + "test": "resource_adaptation_tests", + "test_id_prefix": "ninja://call/adaptation:resource_adaptation_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//media:rtc_media_unittests", "name": "rtc_media_unittests", "resultdb": { @@ -7422,6 +8000,24 @@ "test_id_prefix": "ninja://rtc_tools:tools_unittests/" }, { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, + "module_name": "//video/adaptation:video_adaptation_tests", + "name": "video_adaptation_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Ubuntu-22.04" + } + }, + "test": "video_adaptation_tests", + "test_id_prefix": "ninja://video/adaptation:video_adaptation_tests/" + }, + { "args": [ "--webrtc_quick_perf_test", "--nologs", @@ -7715,6 +8311,24 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//call/adaptation:resource_adaptation_tests", + "name": "resource_adaptation_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Ubuntu-22.04" + } + }, + "test": "resource_adaptation_tests", + "test_id_prefix": "ninja://call/adaptation:resource_adaptation_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//media:rtc_media_unittests", "name": "rtc_media_unittests", "resultdb": { @@ -7916,6 +8530,24 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//video/adaptation:video_adaptation_tests", + "name": "video_adaptation_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Ubuntu-22.04" + } + }, + "test": "video_adaptation_tests", + "test_id_prefix": "ninja://video/adaptation:video_adaptation_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//:video_engine_tests", "name": "video_engine_tests", "resultdb": { @@ -8158,6 +8790,24 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//call/adaptation:resource_adaptation_tests", + "name": "resource_adaptation_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Ubuntu-22.04" + } + }, + "test": "resource_adaptation_tests", + "test_id_prefix": "ninja://call/adaptation:resource_adaptation_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//media:rtc_media_unittests", "name": "rtc_media_unittests", "resultdb": { @@ -8359,6 +9009,24 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//video/adaptation:video_adaptation_tests", + "name": "video_adaptation_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Ubuntu-22.04" + } + }, + "test": "video_adaptation_tests", + "test_id_prefix": "ninja://video/adaptation:video_adaptation_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//:video_engine_tests", "name": "video_engine_tests", "resultdb": { @@ -8601,6 +9269,24 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//call/adaptation:resource_adaptation_tests", + "name": "resource_adaptation_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Ubuntu-22.04" + } + }, + "test": "resource_adaptation_tests", + "test_id_prefix": "ninja://call/adaptation:resource_adaptation_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//media:rtc_media_unittests", "name": "rtc_media_unittests", "resultdb": { @@ -8802,6 +9488,24 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//video/adaptation:video_adaptation_tests", + "name": "video_adaptation_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Ubuntu-22.04" + } + }, + "test": "video_adaptation_tests", + "test_id_prefix": "ninja://video/adaptation:video_adaptation_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//:video_engine_tests", "name": "video_engine_tests", "resultdb": { @@ -9044,6 +9748,24 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//call/adaptation:resource_adaptation_tests", + "name": "resource_adaptation_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Ubuntu-22.04" + } + }, + "test": "resource_adaptation_tests", + "test_id_prefix": "ninja://call/adaptation:resource_adaptation_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//media:rtc_media_unittests", "name": "rtc_media_unittests", "resultdb": { @@ -9227,6 +9949,24 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//video/adaptation:video_adaptation_tests", + "name": "video_adaptation_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Ubuntu-22.04" + } + }, + "test": "video_adaptation_tests", + "test_id_prefix": "ninja://video/adaptation:video_adaptation_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//:video_engine_tests", "name": "video_engine_tests", "resultdb": { @@ -9469,6 +10209,24 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//call/adaptation:resource_adaptation_tests", + "name": "resource_adaptation_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Ubuntu-22.04" + } + }, + "test": "resource_adaptation_tests", + "test_id_prefix": "ninja://call/adaptation:resource_adaptation_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//media:rtc_media_unittests", "name": "rtc_media_unittests", "resultdb": { @@ -9652,6 +10410,24 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//video/adaptation:video_adaptation_tests", + "name": "video_adaptation_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Ubuntu-22.04" + } + }, + "test": "video_adaptation_tests", + "test_id_prefix": "ninja://video/adaptation:video_adaptation_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//:video_engine_tests", "name": "video_engine_tests", "resultdb": { @@ -9903,6 +10679,25 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//call/adaptation:resource_adaptation_tests", + "name": "resource_adaptation_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cores": "12", + "cpu": "x86-64", + "os": "Mac-15" + } + }, + "test": "resource_adaptation_tests", + "test_id_prefix": "ninja://call/adaptation:resource_adaptation_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//media:rtc_media_unittests", "name": "rtc_media_unittests", "resultdb": { @@ -10096,6 +10891,25 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//video/adaptation:video_adaptation_tests", + "name": "video_adaptation_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cores": "12", + "cpu": "x86-64", + "os": "Mac-15" + } + }, + "test": "video_adaptation_tests", + "test_id_prefix": "ninja://video/adaptation:video_adaptation_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//:video_engine_tests", "name": "video_engine_tests", "resultdb": { @@ -10353,6 +11167,25 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//call/adaptation:resource_adaptation_tests", + "name": "resource_adaptation_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cores": "12", + "cpu": "x86-64", + "os": "Mac-15" + } + }, + "test": "resource_adaptation_tests", + "test_id_prefix": "ninja://call/adaptation:resource_adaptation_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//media:rtc_media_unittests", "name": "rtc_media_unittests", "resultdb": { @@ -10546,6 +11379,25 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//video/adaptation:video_adaptation_tests", + "name": "video_adaptation_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cores": "12", + "cpu": "x86-64", + "os": "Mac-15" + } + }, + "test": "video_adaptation_tests", + "test_id_prefix": "ninja://video/adaptation:video_adaptation_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//:video_engine_tests", "name": "video_engine_tests", "resultdb": { @@ -10792,6 +11644,24 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//call/adaptation:resource_adaptation_tests", + "name": "resource_adaptation_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "arm64-64-Apple_M1", + "os": "Mac-15" + } + }, + "test": "resource_adaptation_tests", + "test_id_prefix": "ninja://call/adaptation:resource_adaptation_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//media:rtc_media_unittests", "name": "rtc_media_unittests", "resultdb": { @@ -10975,6 +11845,24 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//video/adaptation:video_adaptation_tests", + "name": "video_adaptation_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "arm64-64-Apple_M1", + "os": "Mac-15" + } + }, + "test": "video_adaptation_tests", + "test_id_prefix": "ninja://video/adaptation:video_adaptation_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//:video_engine_tests", "name": "video_engine_tests", "resultdb": { @@ -11217,6 +12105,24 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//call/adaptation:resource_adaptation_tests", + "name": "resource_adaptation_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Mac-15" + } + }, + "test": "resource_adaptation_tests", + "test_id_prefix": "ninja://call/adaptation:resource_adaptation_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//media:rtc_media_unittests", "name": "rtc_media_unittests", "resultdb": { @@ -11397,6 +12303,24 @@ "test_id_prefix": "ninja://rtc_tools:tools_unittests/" }, { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, + "module_name": "//video/adaptation:video_adaptation_tests", + "name": "video_adaptation_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Mac-15" + } + }, + "test": "video_adaptation_tests", + "test_id_prefix": "ninja://video/adaptation:video_adaptation_tests/" + }, + { "args": [ "--webrtc_quick_perf_test", "--nologs", @@ -11690,6 +12614,24 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//call/adaptation:resource_adaptation_tests", + "name": "resource_adaptation_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "arm64-64-Apple_M1", + "os": "Mac-15" + } + }, + "test": "resource_adaptation_tests", + "test_id_prefix": "ninja://call/adaptation:resource_adaptation_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//media:rtc_media_unittests", "name": "rtc_media_unittests", "resultdb": { @@ -11873,6 +12815,24 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//video/adaptation:video_adaptation_tests", + "name": "video_adaptation_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "arm64-64-Apple_M1", + "os": "Mac-15" + } + }, + "test": "video_adaptation_tests", + "test_id_prefix": "ninja://video/adaptation:video_adaptation_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//:video_engine_tests", "name": "video_engine_tests", "resultdb": { @@ -12115,6 +13075,24 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//call/adaptation:resource_adaptation_tests", + "name": "resource_adaptation_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Windows-11-22000" + } + }, + "test": "resource_adaptation_tests", + "test_id_prefix": "ninja://call/adaptation:resource_adaptation_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//media:rtc_media_unittests", "name": "rtc_media_unittests", "resultdb": { @@ -12298,6 +13276,24 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//video/adaptation:video_adaptation_tests", + "name": "video_adaptation_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Windows-11-22000" + } + }, + "test": "video_adaptation_tests", + "test_id_prefix": "ninja://video/adaptation:video_adaptation_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//:video_engine_tests", "name": "video_engine_tests", "resultdb": { @@ -12540,6 +13536,24 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//call/adaptation:resource_adaptation_tests", + "name": "resource_adaptation_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Windows-11-22000" + } + }, + "test": "resource_adaptation_tests", + "test_id_prefix": "ninja://call/adaptation:resource_adaptation_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//media:rtc_media_unittests", "name": "rtc_media_unittests", "resultdb": { @@ -12720,6 +13734,24 @@ "test_id_prefix": "ninja://rtc_tools:tools_unittests/" }, { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, + "module_name": "//video/adaptation:video_adaptation_tests", + "name": "video_adaptation_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Windows-11-22000" + } + }, + "test": "video_adaptation_tests", + "test_id_prefix": "ninja://video/adaptation:video_adaptation_tests/" + }, + { "args": [ "--webrtc_quick_perf_test", "--nologs", @@ -13013,6 +14045,24 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//call/adaptation:resource_adaptation_tests", + "name": "resource_adaptation_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Windows-10-19045" + } + }, + "test": "resource_adaptation_tests", + "test_id_prefix": "ninja://call/adaptation:resource_adaptation_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//media:rtc_media_unittests", "name": "rtc_media_unittests", "resultdb": { @@ -13196,6 +14246,24 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//video/adaptation:video_adaptation_tests", + "name": "video_adaptation_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Windows-10-19045" + } + }, + "test": "video_adaptation_tests", + "test_id_prefix": "ninja://video/adaptation:video_adaptation_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//:video_engine_tests", "name": "video_engine_tests", "resultdb": { @@ -13442,6 +14510,24 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//call/adaptation:resource_adaptation_tests", + "name": "resource_adaptation_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Windows-10-19045" + } + }, + "test": "resource_adaptation_tests", + "test_id_prefix": "ninja://call/adaptation:resource_adaptation_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//media:rtc_media_unittests", "name": "rtc_media_unittests", "resultdb": { @@ -13625,6 +14711,24 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//video/adaptation:video_adaptation_tests", + "name": "video_adaptation_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Windows-10-19045" + } + }, + "test": "video_adaptation_tests", + "test_id_prefix": "ninja://video/adaptation:video_adaptation_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//:video_engine_tests", "name": "video_engine_tests", "resultdb": { @@ -13867,6 +14971,24 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//call/adaptation:resource_adaptation_tests", + "name": "resource_adaptation_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Windows-10-19045" + } + }, + "test": "resource_adaptation_tests", + "test_id_prefix": "ninja://call/adaptation:resource_adaptation_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//media:rtc_media_unittests", "name": "rtc_media_unittests", "resultdb": { @@ -14050,6 +15172,24 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//video/adaptation:video_adaptation_tests", + "name": "video_adaptation_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Windows-10-19045" + } + }, + "test": "video_adaptation_tests", + "test_id_prefix": "ninja://video/adaptation:video_adaptation_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//:video_engine_tests", "name": "video_engine_tests", "resultdb": { @@ -14292,6 +15432,24 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//call/adaptation:resource_adaptation_tests", + "name": "resource_adaptation_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Windows-10-19045" + } + }, + "test": "resource_adaptation_tests", + "test_id_prefix": "ninja://call/adaptation:resource_adaptation_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//media:rtc_media_unittests", "name": "rtc_media_unittests", "resultdb": { @@ -14475,6 +15633,24 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//video/adaptation:video_adaptation_tests", + "name": "video_adaptation_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Windows-10-19045" + } + }, + "test": "video_adaptation_tests", + "test_id_prefix": "ninja://video/adaptation:video_adaptation_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//:video_engine_tests", "name": "video_engine_tests", "resultdb": { @@ -14717,6 +15893,24 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, + "module_name": "//call/adaptation:resource_adaptation_tests", + "name": "resource_adaptation_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Windows-10-19045" + } + }, + "test": "resource_adaptation_tests", + "test_id_prefix": "ninja://call/adaptation:resource_adaptation_tests/" + }, + { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, "module_name": "//media:rtc_media_unittests", "name": "rtc_media_unittests", "resultdb": { @@ -14897,6 +16091,24 @@ "test_id_prefix": "ninja://rtc_tools:tools_unittests/" }, { + "merge": { + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, + "module_name": "//video/adaptation:video_adaptation_tests", + "name": "video_adaptation_tests", + "resultdb": { + "result_format": "json" + }, + "swarming": { + "dimensions": { + "cpu": "x86-64", + "os": "Windows-10-19045" + } + }, + "test": "video_adaptation_tests", + "test_id_prefix": "ninja://video/adaptation:video_adaptation_tests/" + }, + { "args": [ "--webrtc_quick_perf_test", "--nologs",
diff --git a/video/adaptation/BUILD.gn b/video/adaptation/BUILD.gn index 9b5cfd7..057fe0a 100644 --- a/video/adaptation/BUILD.gn +++ b/video/adaptation/BUILD.gn
@@ -72,46 +72,80 @@ } if (rtc_include_tests) { - rtc_library("video_adaptation_tests") { - testonly = true - - defines = [] - sources = [ - "bitrate_constraint_unittest.cc", - "overuse_frame_detector_unittest.cc", - "pixel_limit_resource_unittest.cc", - "quality_scaler_resource_unittest.cc", - ] + rtc_cc_test("bitrate_constraint_unittest") { + sources = [ "bitrate_constraint_unittest.cc" ] deps = [ ":video_adaptation", - "..:video_stream_encoder_interface", - "../../api:field_trials", - "../../api:rtp_parameters", - "../../api:scoped_refptr", - "../../api/adaptation:resource_adaptation_api", - "../../api/environment", - "../../api/task_queue", - "../../api/units:time_delta", - "../../api/units:timestamp", - "../../api/video:video_adaptation", "../../api/video:video_frame", - "../../api/video:video_rtp_headers", "../../api/video_codecs:scalability_mode", "../../api/video_codecs:video_codecs_api", "../../call/adaptation:resource_adaptation", "../../call/adaptation:resource_adaptation_test_utilities", + "../../test:test_support", + "../config:encoder_config", + ] + } + + rtc_cc_test("overuse_frame_detector_unittest") { + sources = [ "overuse_frame_detector_unittest.cc" ] + deps = [ + ":video_adaptation", + "..:video_stream_encoder_interface", + "../../api/environment", + "../../api/units:time_delta", + "../../api/units:timestamp", + "../../api/video:video_frame", + "../../api/video:video_rtp_headers", "../../rtc_base:random", "../../rtc_base:rtc_event", "../../rtc_base:task_queue_for_test", - "../../rtc_base:threading", "../../system_wrappers", "../../test:create_test_environment", + "../../test:test_support", + ] + } + + rtc_cc_test("pixel_limit_resource_unittest") { + sources = [ "pixel_limit_resource_unittest.cc" ] + deps = [ + ":video_adaptation", + "../../api:field_trials", + "../../api:scoped_refptr", + "../../api/adaptation:resource_adaptation_api", + "../../api/task_queue", + "../../api/units:time_delta", + "../../api/units:timestamp", + "../../api/video:video_adaptation", + "../../call/adaptation:resource_adaptation", + "../../call/adaptation:resource_adaptation_test_utilities", "../../test:create_test_field_trials", - "../../test:run_loop", "../../test:test_support", "../../test/time_controller", - "../config:encoder_config", "//third_party/abseil-cpp/absl/functional:any_invocable", ] } + + rtc_cc_test("quality_scaler_resource_unittest") { + sources = [ "quality_scaler_resource_unittest.cc" ] + deps = [ + ":video_adaptation", + "../../api:rtp_parameters", + "../../api:scoped_refptr", + "../../api/adaptation:resource_adaptation_api", + "../../api/task_queue", + "../../call/adaptation:resource_adaptation", + "../../call/adaptation:resource_adaptation_test_utilities", + "../../test:run_loop", + "../../test:test_support", + ] + } + + rtc_test_suite("video_adaptation_tests") { + tests = [ + ":bitrate_constraint_unittest", + ":overuse_frame_detector_unittest", + ":pixel_limit_resource_unittest", + ":quality_scaler_resource_unittest", + ] + } }