tor-browser

The Tor Browser
git clone https://git.dasho.dev/tor-browser.git
Log | Files | Refs | README | LICENSE

commit 7c26f26cfd211a37d3c63461e234fc78abdbabf7
parent 7bdcd27090595599942f8ecabce8bbd3b00b6f16
Author: Dan Baker <dbaker@mozilla.com>
Date:   Wed, 19 Nov 2025 17:51:18 -0700

Bug 2000941 - Vendor libwebrtc from fce8a266f5

Upstream commit: https://webrtc.googlesource.com/src/+/fce8a266f582f327e980a2f51cc65de94ad68f90
    Update ios simulator variants.

    iPhone x/10 simulator does not work well with newer xcode versions.

    Change-Id: Ib1e411bd54d546fa3ca827d2f3dee718e4ff1837
    Bug: chromium:441889296
    Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/407480
    Commit-Queue: Jeremy Leconte <jleconte@google.com>
    Reviewed-by: Christoffer Dewerin <jansson@webrtc.org>
    Cr-Commit-Position: refs/heads/main@{#45527}

Diffstat:
Mthird_party/libwebrtc/README.mozilla.last-vendor | 4++--
Mthird_party/libwebrtc/infra/specs/client.webrtc.json | 1465++++++++++++++-----------------------------------------------------------------
Mthird_party/libwebrtc/infra/specs/mixins.pyl | 8--------
Mthird_party/libwebrtc/infra/specs/mixins_webrtc.pyl | 10----------
Mthird_party/libwebrtc/infra/specs/test_suites.pyl | 1-
Mthird_party/libwebrtc/infra/specs/tryserver.webrtc.json | 1465++++++++++++++-----------------------------------------------------------------
Mthird_party/libwebrtc/infra/specs/variants.pyl | 10----------
7 files changed, 498 insertions(+), 2465 deletions(-)

diff --git a/third_party/libwebrtc/README.mozilla.last-vendor b/third_party/libwebrtc/README.mozilla.last-vendor @@ -1,4 +1,4 @@ # ./mach python dom/media/webrtc/third_party_build/vendor-libwebrtc.py --from-local /Users/danielbaker/elm/.moz-fast-forward/moz-libwebrtc --commit mozpatches libwebrtc -libwebrtc updated from /Users/danielbaker/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2025-11-20T00:45:47.126882+00:00. +libwebrtc updated from /Users/danielbaker/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2025-11-20T00:50:57.036807+00:00. # base of lastest vendoring -5dcfbc8e8a +fce8a266f5 diff --git a/third_party/libwebrtc/infra/specs/client.webrtc.json b/third_party/libwebrtc/infra/specs/client.webrtc.json @@ -8554,55 +8554,6 @@ }, { "args": [ - "--xcodebuild-sim-runner", - "--platform", - "iPhone X", - "--version", - "16.4", - "--xcode-build-version", - "17a5305f", - "--out-dir", - "${ISOLATED_OUTDIR}", - "--xctest" - ], - "merge": { - "script": "//testing/merge_scripts/standard_isolated_script_merge.py" - }, - "name": "apprtcmobile_tests iPhone X 16.4", - "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": "x86-64", - "os": "Mac-15" - }, - "named_caches": [ - { - "name": "xcode_ios_17a5305f", - "path": "Xcode.app" - }, - { - "name": "runtime_ios_16_4", - "path": "Runtime-ios-16.4" - } - ], - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "apprtcmobile_tests", - "test_id_prefix": "ninja://examples:apprtcmobile_tests/", - "variant_id": "iPhone X 16.4" - }, - { - "args": [ "--platform", "iPhone 14", "--version", @@ -8700,54 +8651,6 @@ { "args": [ "--platform", - "iPhone X", - "--version", - "16.4", - "--xcode-build-version", - "17a5305f", - "--out-dir", - "${ISOLATED_OUTDIR}", - "--xctest" - ], - "merge": { - "script": "//testing/merge_scripts/standard_isolated_script_merge.py" - }, - "name": "audio_decoder_unittests iPhone X 16.4", - "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": "x86-64", - "os": "Mac-15" - }, - "named_caches": [ - { - "name": "xcode_ios_17a5305f", - "path": "Xcode.app" - }, - { - "name": "runtime_ios_16_4", - "path": "Runtime-ios-16.4" - } - ], - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "audio_decoder_unittests", - "test_id_prefix": "ninja://modules/audio_coding:audio_decoder_unittests/", - "variant_id": "iPhone X 16.4" - }, - { - "args": [ - "--platform", "iPhone 14", "--version", "17.5", @@ -8844,9 +8747,9 @@ { "args": [ "--platform", - "iPhone X", + "iPhone 14", "--version", - "16.4", + "17.5", "--xcode-build-version", "17a5305f", "--out-dir", @@ -8856,7 +8759,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "common_audio_unittests iPhone X 16.4", + "name": "common_video_unittests iPhone 14 17.5", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -8879,22 +8782,22 @@ "path": "Xcode.app" }, { - "name": "runtime_ios_16_4", - "path": "Runtime-ios-16.4" + "name": "runtime_ios_17_5", + "path": "Runtime-ios-17.5" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, - "test": "common_audio_unittests", - "test_id_prefix": "ninja://common_audio:common_audio_unittests/", - "variant_id": "iPhone X 16.4" + "test": "common_video_unittests", + "test_id_prefix": "ninja://common_video:common_video_unittests/", + "variant_id": "iPhone 14 17.5" }, { "args": [ "--platform", - "iPhone 14", + "iPhone 15", "--version", - "17.5", + "18.2", "--xcode-build-version", "17a5305f", "--out-dir", @@ -8904,7 +8807,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "common_video_unittests iPhone 14 17.5", + "name": "common_video_unittests iPhone 15 18.2", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -8927,22 +8830,22 @@ "path": "Xcode.app" }, { - "name": "runtime_ios_17_5", - "path": "Runtime-ios-17.5" + "name": "runtime_ios_18_2", + "path": "Runtime-ios-18.2" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "common_video_unittests", "test_id_prefix": "ninja://common_video:common_video_unittests/", - "variant_id": "iPhone 14 17.5" + "variant_id": "iPhone 15 18.2" }, { "args": [ "--platform", - "iPhone 15", + "iPhone 14", "--version", - "18.2", + "17.5", "--xcode-build-version", "17a5305f", "--out-dir", @@ -8952,7 +8855,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "common_video_unittests iPhone 15 18.2", + "name": "dcsctp_unittests iPhone 14 17.5", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -8975,22 +8878,22 @@ "path": "Xcode.app" }, { - "name": "runtime_ios_18_2", - "path": "Runtime-ios-18.2" + "name": "runtime_ios_17_5", + "path": "Runtime-ios-17.5" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, - "test": "common_video_unittests", - "test_id_prefix": "ninja://common_video:common_video_unittests/", - "variant_id": "iPhone 15 18.2" + "test": "dcsctp_unittests", + "test_id_prefix": "ninja://net/dcsctp:dcsctp_unittests/", + "variant_id": "iPhone 14 17.5" }, { "args": [ "--platform", - "iPhone X", + "iPhone 15", "--version", - "16.4", + "18.2", "--xcode-build-version", "17a5305f", "--out-dir", @@ -9000,7 +8903,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "common_video_unittests iPhone X 16.4", + "name": "dcsctp_unittests iPhone 15 18.2", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -9023,15 +8926,15 @@ "path": "Xcode.app" }, { - "name": "runtime_ios_16_4", - "path": "Runtime-ios-16.4" + "name": "runtime_ios_18_2", + "path": "Runtime-ios-18.2" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, - "test": "common_video_unittests", - "test_id_prefix": "ninja://common_video:common_video_unittests/", - "variant_id": "iPhone X 16.4" + "test": "dcsctp_unittests", + "test_id_prefix": "ninja://net/dcsctp:dcsctp_unittests/", + "variant_id": "iPhone 15 18.2" }, { "args": [ @@ -9048,7 +8951,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "dcsctp_unittests iPhone 14 17.5", + "name": "modules_tests iPhone 14 17.5", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -9075,10 +8978,11 @@ "path": "Runtime-ios-17.5" } ], - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", + "shards": 2 }, - "test": "dcsctp_unittests", - "test_id_prefix": "ninja://net/dcsctp:dcsctp_unittests/", + "test": "modules_tests", + "test_id_prefix": "ninja://modules:modules_tests/", "variant_id": "iPhone 14 17.5" }, { @@ -9096,7 +9000,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "dcsctp_unittests iPhone 15 18.2", + "name": "modules_tests iPhone 15 18.2", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -9123,18 +9027,19 @@ "path": "Runtime-ios-18.2" } ], - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", + "shards": 2 }, - "test": "dcsctp_unittests", - "test_id_prefix": "ninja://net/dcsctp:dcsctp_unittests/", + "test": "modules_tests", + "test_id_prefix": "ninja://modules:modules_tests/", "variant_id": "iPhone 15 18.2" }, { "args": [ "--platform", - "iPhone X", + "iPhone 14", "--version", - "16.4", + "17.5", "--xcode-build-version", "17a5305f", "--out-dir", @@ -9144,7 +9049,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "dcsctp_unittests iPhone X 16.4", + "name": "modules_unittests iPhone 14 17.5", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -9158,6 +9063,7 @@ } ], "dimensions": { + "cores": "12", "cpu": "x86-64", "os": "Mac-15" }, @@ -9167,22 +9073,23 @@ "path": "Xcode.app" }, { - "name": "runtime_ios_16_4", - "path": "Runtime-ios-16.4" + "name": "runtime_ios_17_5", + "path": "Runtime-ios-17.5" } ], - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", + "shards": 6 }, - "test": "dcsctp_unittests", - "test_id_prefix": "ninja://net/dcsctp:dcsctp_unittests/", - "variant_id": "iPhone X 16.4" + "test": "modules_unittests", + "test_id_prefix": "ninja://modules:modules_unittests/", + "variant_id": "iPhone 14 17.5" }, { "args": [ "--platform", - "iPhone 14", + "iPhone 15", "--version", - "17.5", + "18.2", "--xcode-build-version", "17a5305f", "--out-dir", @@ -9192,7 +9099,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "modules_tests iPhone 14 17.5", + "name": "modules_unittests iPhone 15 18.2", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -9206,6 +9113,7 @@ } ], "dimensions": { + "cores": "12", "cpu": "x86-64", "os": "Mac-15" }, @@ -9215,23 +9123,23 @@ "path": "Xcode.app" }, { - "name": "runtime_ios_17_5", - "path": "Runtime-ios-17.5" + "name": "runtime_ios_18_2", + "path": "Runtime-ios-18.2" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", - "shards": 2 + "shards": 6 }, - "test": "modules_tests", - "test_id_prefix": "ninja://modules:modules_tests/", - "variant_id": "iPhone 14 17.5" + "test": "modules_unittests", + "test_id_prefix": "ninja://modules:modules_unittests/", + "variant_id": "iPhone 15 18.2" }, { "args": [ "--platform", - "iPhone 15", + "iPhone 14", "--version", - "18.2", + "17.5", "--xcode-build-version", "17a5305f", "--out-dir", @@ -9241,7 +9149,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "modules_tests iPhone 15 18.2", + "name": "rtc_media_unittests iPhone 14 17.5", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -9264,23 +9172,22 @@ "path": "Xcode.app" }, { - "name": "runtime_ios_18_2", - "path": "Runtime-ios-18.2" + "name": "runtime_ios_17_5", + "path": "Runtime-ios-17.5" } ], - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", - "shards": 2 + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, - "test": "modules_tests", - "test_id_prefix": "ninja://modules:modules_tests/", - "variant_id": "iPhone 15 18.2" + "test": "rtc_media_unittests", + "test_id_prefix": "ninja://media:rtc_media_unittests/", + "variant_id": "iPhone 14 17.5" }, { "args": [ "--platform", - "iPhone X", + "iPhone 15", "--version", - "16.4", + "18.2", "--xcode-build-version", "17a5305f", "--out-dir", @@ -9290,7 +9197,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "modules_tests iPhone X 16.4", + "name": "rtc_media_unittests iPhone 15 18.2", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -9313,16 +9220,15 @@ "path": "Xcode.app" }, { - "name": "runtime_ios_16_4", - "path": "Runtime-ios-16.4" + "name": "runtime_ios_18_2", + "path": "Runtime-ios-18.2" } ], - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", - "shards": 2 + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, - "test": "modules_tests", - "test_id_prefix": "ninja://modules:modules_tests/", - "variant_id": "iPhone X 16.4" + "test": "rtc_media_unittests", + "test_id_prefix": "ninja://media:rtc_media_unittests/", + "variant_id": "iPhone 15 18.2" }, { "args": [ @@ -9339,7 +9245,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "modules_unittests iPhone 14 17.5", + "name": "rtc_p2p_unittests iPhone 14 17.5", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -9353,7 +9259,6 @@ } ], "dimensions": { - "cores": "12", "cpu": "x86-64", "os": "Mac-15" }, @@ -9367,11 +9272,10 @@ "path": "Runtime-ios-17.5" } ], - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", - "shards": 6 + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, - "test": "modules_unittests", - "test_id_prefix": "ninja://modules:modules_unittests/", + "test": "rtc_p2p_unittests", + "test_id_prefix": "ninja://:rtc_p2p_unittests/", "variant_id": "iPhone 14 17.5" }, { @@ -9389,7 +9293,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "modules_unittests iPhone 15 18.2", + "name": "rtc_p2p_unittests iPhone 15 18.2", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -9403,7 +9307,6 @@ } ], "dimensions": { - "cores": "12", "cpu": "x86-64", "os": "Mac-15" }, @@ -9417,19 +9320,18 @@ "path": "Runtime-ios-18.2" } ], - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", - "shards": 6 + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, - "test": "modules_unittests", - "test_id_prefix": "ninja://modules:modules_unittests/", + "test": "rtc_p2p_unittests", + "test_id_prefix": "ninja://:rtc_p2p_unittests/", "variant_id": "iPhone 15 18.2" }, { "args": [ "--platform", - "iPhone X", + "iPhone 14", "--version", - "16.4", + "17.5", "--xcode-build-version", "17a5305f", "--out-dir", @@ -9439,7 +9341,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "modules_unittests iPhone X 16.4", + "name": "rtc_pc_unittests iPhone 14 17.5", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -9453,7 +9355,6 @@ } ], "dimensions": { - "cores": "12", "cpu": "x86-64", "os": "Mac-15" }, @@ -9463,23 +9364,22 @@ "path": "Xcode.app" }, { - "name": "runtime_ios_16_4", - "path": "Runtime-ios-16.4" + "name": "runtime_ios_17_5", + "path": "Runtime-ios-17.5" } ], - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", - "shards": 6 + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, - "test": "modules_unittests", - "test_id_prefix": "ninja://modules:modules_unittests/", - "variant_id": "iPhone X 16.4" + "test": "rtc_pc_unittests", + "test_id_prefix": "ninja://pc:rtc_pc_unittests/", + "variant_id": "iPhone 14 17.5" }, { "args": [ "--platform", - "iPhone 14", + "iPhone 15", "--version", - "17.5", + "18.2", "--xcode-build-version", "17a5305f", "--out-dir", @@ -9489,877 +9389,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "rtc_media_unittests 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": "x86-64", - "os": "Mac-15" - }, - "named_caches": [ - { - "name": "xcode_ios_17a5305f", - "path": "Xcode.app" - }, - { - "name": "runtime_ios_17_5", - "path": "Runtime-ios-17.5" - } - ], - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "rtc_media_unittests", - "test_id_prefix": "ninja://media:rtc_media_unittests/", - "variant_id": "iPhone 14 17.5" - }, - { - "args": [ - "--platform", - "iPhone 15", - "--version", - "18.2", - "--xcode-build-version", - "17a5305f", - "--out-dir", - "${ISOLATED_OUTDIR}", - "--xctest" - ], - "merge": { - "script": "//testing/merge_scripts/standard_isolated_script_merge.py" - }, - "name": "rtc_media_unittests 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": "x86-64", - "os": "Mac-15" - }, - "named_caches": [ - { - "name": "xcode_ios_17a5305f", - "path": "Xcode.app" - }, - { - "name": "runtime_ios_18_2", - "path": "Runtime-ios-18.2" - } - ], - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "rtc_media_unittests", - "test_id_prefix": "ninja://media:rtc_media_unittests/", - "variant_id": "iPhone 15 18.2" - }, - { - "args": [ - "--platform", - "iPhone X", - "--version", - "16.4", - "--xcode-build-version", - "17a5305f", - "--out-dir", - "${ISOLATED_OUTDIR}", - "--xctest" - ], - "merge": { - "script": "//testing/merge_scripts/standard_isolated_script_merge.py" - }, - "name": "rtc_media_unittests iPhone X 16.4", - "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": "x86-64", - "os": "Mac-15" - }, - "named_caches": [ - { - "name": "xcode_ios_17a5305f", - "path": "Xcode.app" - }, - { - "name": "runtime_ios_16_4", - "path": "Runtime-ios-16.4" - } - ], - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "rtc_media_unittests", - "test_id_prefix": "ninja://media:rtc_media_unittests/", - "variant_id": "iPhone X 16.4" - }, - { - "args": [ - "--platform", - "iPhone 14", - "--version", - "17.5", - "--xcode-build-version", - "17a5305f", - "--out-dir", - "${ISOLATED_OUTDIR}", - "--xctest" - ], - "merge": { - "script": "//testing/merge_scripts/standard_isolated_script_merge.py" - }, - "name": "rtc_p2p_unittests 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": "x86-64", - "os": "Mac-15" - }, - "named_caches": [ - { - "name": "xcode_ios_17a5305f", - "path": "Xcode.app" - }, - { - "name": "runtime_ios_17_5", - "path": "Runtime-ios-17.5" - } - ], - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "rtc_p2p_unittests", - "test_id_prefix": "ninja://:rtc_p2p_unittests/", - "variant_id": "iPhone 14 17.5" - }, - { - "args": [ - "--platform", - "iPhone 15", - "--version", - "18.2", - "--xcode-build-version", - "17a5305f", - "--out-dir", - "${ISOLATED_OUTDIR}", - "--xctest" - ], - "merge": { - "script": "//testing/merge_scripts/standard_isolated_script_merge.py" - }, - "name": "rtc_p2p_unittests 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": "x86-64", - "os": "Mac-15" - }, - "named_caches": [ - { - "name": "xcode_ios_17a5305f", - "path": "Xcode.app" - }, - { - "name": "runtime_ios_18_2", - "path": "Runtime-ios-18.2" - } - ], - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "rtc_p2p_unittests", - "test_id_prefix": "ninja://:rtc_p2p_unittests/", - "variant_id": "iPhone 15 18.2" - }, - { - "args": [ - "--platform", - "iPhone X", - "--version", - "16.4", - "--xcode-build-version", - "17a5305f", - "--out-dir", - "${ISOLATED_OUTDIR}", - "--xctest" - ], - "merge": { - "script": "//testing/merge_scripts/standard_isolated_script_merge.py" - }, - "name": "rtc_p2p_unittests iPhone X 16.4", - "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": "x86-64", - "os": "Mac-15" - }, - "named_caches": [ - { - "name": "xcode_ios_17a5305f", - "path": "Xcode.app" - }, - { - "name": "runtime_ios_16_4", - "path": "Runtime-ios-16.4" - } - ], - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "rtc_p2p_unittests", - "test_id_prefix": "ninja://:rtc_p2p_unittests/", - "variant_id": "iPhone X 16.4" - }, - { - "args": [ - "--platform", - "iPhone 14", - "--version", - "17.5", - "--xcode-build-version", - "17a5305f", - "--out-dir", - "${ISOLATED_OUTDIR}", - "--xctest" - ], - "merge": { - "script": "//testing/merge_scripts/standard_isolated_script_merge.py" - }, - "name": "rtc_pc_unittests 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": "x86-64", - "os": "Mac-15" - }, - "named_caches": [ - { - "name": "xcode_ios_17a5305f", - "path": "Xcode.app" - }, - { - "name": "runtime_ios_17_5", - "path": "Runtime-ios-17.5" - } - ], - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "rtc_pc_unittests", - "test_id_prefix": "ninja://pc:rtc_pc_unittests/", - "variant_id": "iPhone 14 17.5" - }, - { - "args": [ - "--platform", - "iPhone 15", - "--version", - "18.2", - "--xcode-build-version", - "17a5305f", - "--out-dir", - "${ISOLATED_OUTDIR}", - "--xctest" - ], - "merge": { - "script": "//testing/merge_scripts/standard_isolated_script_merge.py" - }, - "name": "rtc_pc_unittests 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": "x86-64", - "os": "Mac-15" - }, - "named_caches": [ - { - "name": "xcode_ios_17a5305f", - "path": "Xcode.app" - }, - { - "name": "runtime_ios_18_2", - "path": "Runtime-ios-18.2" - } - ], - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "rtc_pc_unittests", - "test_id_prefix": "ninja://pc:rtc_pc_unittests/", - "variant_id": "iPhone 15 18.2" - }, - { - "args": [ - "--platform", - "iPhone X", - "--version", - "16.4", - "--xcode-build-version", - "17a5305f", - "--out-dir", - "${ISOLATED_OUTDIR}", - "--xctest" - ], - "merge": { - "script": "//testing/merge_scripts/standard_isolated_script_merge.py" - }, - "name": "rtc_pc_unittests iPhone X 16.4", - "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": "x86-64", - "os": "Mac-15" - }, - "named_caches": [ - { - "name": "xcode_ios_17a5305f", - "path": "Xcode.app" - }, - { - "name": "runtime_ios_16_4", - "path": "Runtime-ios-16.4" - } - ], - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "rtc_pc_unittests", - "test_id_prefix": "ninja://pc:rtc_pc_unittests/", - "variant_id": "iPhone X 16.4" - }, - { - "args": [ - "--platform", - "iPhone 14", - "--version", - "17.5", - "--xcode-build-version", - "17a5305f", - "--out-dir", - "${ISOLATED_OUTDIR}", - "--xctest" - ], - "merge": { - "script": "//testing/merge_scripts/standard_isolated_script_merge.py" - }, - "name": "rtc_stats_unittests 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": "x86-64", - "os": "Mac-15" - }, - "named_caches": [ - { - "name": "xcode_ios_17a5305f", - "path": "Xcode.app" - }, - { - "name": "runtime_ios_17_5", - "path": "Runtime-ios-17.5" - } - ], - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "rtc_stats_unittests", - "test_id_prefix": "ninja://stats:rtc_stats_unittests/", - "variant_id": "iPhone 14 17.5" - }, - { - "args": [ - "--platform", - "iPhone 15", - "--version", - "18.2", - "--xcode-build-version", - "17a5305f", - "--out-dir", - "${ISOLATED_OUTDIR}", - "--xctest" - ], - "merge": { - "script": "//testing/merge_scripts/standard_isolated_script_merge.py" - }, - "name": "rtc_stats_unittests 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": "x86-64", - "os": "Mac-15" - }, - "named_caches": [ - { - "name": "xcode_ios_17a5305f", - "path": "Xcode.app" - }, - { - "name": "runtime_ios_18_2", - "path": "Runtime-ios-18.2" - } - ], - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "rtc_stats_unittests", - "test_id_prefix": "ninja://stats:rtc_stats_unittests/", - "variant_id": "iPhone 15 18.2" - }, - { - "args": [ - "--platform", - "iPhone X", - "--version", - "16.4", - "--xcode-build-version", - "17a5305f", - "--out-dir", - "${ISOLATED_OUTDIR}", - "--xctest" - ], - "merge": { - "script": "//testing/merge_scripts/standard_isolated_script_merge.py" - }, - "name": "rtc_stats_unittests iPhone X 16.4", - "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": "x86-64", - "os": "Mac-15" - }, - "named_caches": [ - { - "name": "xcode_ios_17a5305f", - "path": "Xcode.app" - }, - { - "name": "runtime_ios_16_4", - "path": "Runtime-ios-16.4" - } - ], - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "rtc_stats_unittests", - "test_id_prefix": "ninja://stats:rtc_stats_unittests/", - "variant_id": "iPhone X 16.4" - }, - { - "args": [ - "--xcodebuild-sim-runner", - "--platform", - "iPhone 14", - "--version", - "17.5", - "--xcode-build-version", - "17a5305f", - "--out-dir", - "${ISOLATED_OUTDIR}", - "--xctest" - ], - "merge": { - "script": "//testing/merge_scripts/standard_isolated_script_merge.py" - }, - "name": "sdk_framework_unittests 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": "x86-64", - "os": "Mac-15" - }, - "named_caches": [ - { - "name": "xcode_ios_17a5305f", - "path": "Xcode.app" - }, - { - "name": "runtime_ios_17_5", - "path": "Runtime-ios-17.5" - } - ], - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "sdk_framework_unittests", - "test_id_prefix": "ninja://sdk:sdk_framework_unittests/", - "variant_id": "iPhone 14 17.5" - }, - { - "args": [ - "--xcodebuild-sim-runner", - "--platform", - "iPhone 15", - "--version", - "18.2", - "--xcode-build-version", - "17a5305f", - "--out-dir", - "${ISOLATED_OUTDIR}", - "--xctest" - ], - "merge": { - "script": "//testing/merge_scripts/standard_isolated_script_merge.py" - }, - "name": "sdk_framework_unittests 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": "x86-64", - "os": "Mac-15" - }, - "named_caches": [ - { - "name": "xcode_ios_17a5305f", - "path": "Xcode.app" - }, - { - "name": "runtime_ios_18_2", - "path": "Runtime-ios-18.2" - } - ], - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "sdk_framework_unittests", - "test_id_prefix": "ninja://sdk:sdk_framework_unittests/", - "variant_id": "iPhone 15 18.2" - }, - { - "args": [ - "--xcodebuild-sim-runner", - "--platform", - "iPhone X", - "--version", - "16.4", - "--xcode-build-version", - "17a5305f", - "--out-dir", - "${ISOLATED_OUTDIR}", - "--xctest" - ], - "merge": { - "script": "//testing/merge_scripts/standard_isolated_script_merge.py" - }, - "name": "sdk_framework_unittests iPhone X 16.4", - "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": "x86-64", - "os": "Mac-15" - }, - "named_caches": [ - { - "name": "xcode_ios_17a5305f", - "path": "Xcode.app" - }, - { - "name": "runtime_ios_16_4", - "path": "Runtime-ios-16.4" - } - ], - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "sdk_framework_unittests", - "test_id_prefix": "ninja://sdk:sdk_framework_unittests/", - "variant_id": "iPhone X 16.4" - }, - { - "args": [ - "--xcodebuild-sim-runner", - "--platform", - "iPhone 14", - "--version", - "17.5", - "--xcode-build-version", - "17a5305f", - "--out-dir", - "${ISOLATED_OUTDIR}", - "--xctest" - ], - "merge": { - "script": "//testing/merge_scripts/standard_isolated_script_merge.py" - }, - "name": "sdk_unittests 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": "x86-64", - "os": "Mac-15" - }, - "named_caches": [ - { - "name": "xcode_ios_17a5305f", - "path": "Xcode.app" - }, - { - "name": "runtime_ios_17_5", - "path": "Runtime-ios-17.5" - } - ], - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "sdk_unittests", - "test_id_prefix": "ninja://sdk:sdk_unittests/", - "variant_id": "iPhone 14 17.5" - }, - { - "args": [ - "--xcodebuild-sim-runner", - "--platform", - "iPhone 15", - "--version", - "18.2", - "--xcode-build-version", - "17a5305f", - "--out-dir", - "${ISOLATED_OUTDIR}", - "--xctest" - ], - "merge": { - "script": "//testing/merge_scripts/standard_isolated_script_merge.py" - }, - "name": "sdk_unittests 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": "x86-64", - "os": "Mac-15" - }, - "named_caches": [ - { - "name": "xcode_ios_17a5305f", - "path": "Xcode.app" - }, - { - "name": "runtime_ios_18_2", - "path": "Runtime-ios-18.2" - } - ], - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "sdk_unittests", - "test_id_prefix": "ninja://sdk:sdk_unittests/", - "variant_id": "iPhone 15 18.2" - }, - { - "args": [ - "--xcodebuild-sim-runner", - "--platform", - "iPhone X", - "--version", - "16.4", - "--xcode-build-version", - "17a5305f", - "--out-dir", - "${ISOLATED_OUTDIR}", - "--xctest" - ], - "merge": { - "script": "//testing/merge_scripts/standard_isolated_script_merge.py" - }, - "name": "sdk_unittests iPhone X 16.4", - "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": "x86-64", - "os": "Mac-15" - }, - "named_caches": [ - { - "name": "xcode_ios_17a5305f", - "path": "Xcode.app" - }, - { - "name": "runtime_ios_16_4", - "path": "Runtime-ios-16.4" - } - ], - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "sdk_unittests", - "test_id_prefix": "ninja://sdk:sdk_unittests/", - "variant_id": "iPhone X 16.4" - }, - { - "args": [ - "--platform", - "iPhone 14", - "--version", - "17.5", - "--xcode-build-version", - "17a5305f", - "--out-dir", - "${ISOLATED_OUTDIR}", - "--xctest" - ], - "merge": { - "script": "//testing/merge_scripts/standard_isolated_script_merge.py" - }, - "name": "svc_tests iPhone 14 17.5", + "name": "rtc_pc_unittests iPhone 15 18.2", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -10373,7 +9403,6 @@ } ], "dimensions": { - "cores": "12", "cpu": "x86-64", "os": "Mac-15" }, @@ -10383,23 +9412,22 @@ "path": "Xcode.app" }, { - "name": "runtime_ios_17_5", - "path": "Runtime-ios-17.5" + "name": "runtime_ios_18_2", + "path": "Runtime-ios-18.2" } ], - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", - "shards": 4 + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, - "test": "svc_tests", - "test_id_prefix": "ninja://pc:svc_tests/", - "variant_id": "iPhone 14 17.5" + "test": "rtc_pc_unittests", + "test_id_prefix": "ninja://pc:rtc_pc_unittests/", + "variant_id": "iPhone 15 18.2" }, { "args": [ "--platform", - "iPhone 15", + "iPhone 14", "--version", - "18.2", + "17.5", "--xcode-build-version", "17a5305f", "--out-dir", @@ -10409,7 +9437,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "svc_tests iPhone 15 18.2", + "name": "rtc_stats_unittests iPhone 14 17.5", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -10423,7 +9451,6 @@ } ], "dimensions": { - "cores": "12", "cpu": "x86-64", "os": "Mac-15" }, @@ -10433,23 +9460,22 @@ "path": "Xcode.app" }, { - "name": "runtime_ios_18_2", - "path": "Runtime-ios-18.2" + "name": "runtime_ios_17_5", + "path": "Runtime-ios-17.5" } ], - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", - "shards": 4 + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, - "test": "svc_tests", - "test_id_prefix": "ninja://pc:svc_tests/", - "variant_id": "iPhone 15 18.2" + "test": "rtc_stats_unittests", + "test_id_prefix": "ninja://stats:rtc_stats_unittests/", + "variant_id": "iPhone 14 17.5" }, { "args": [ "--platform", - "iPhone X", + "iPhone 15", "--version", - "16.4", + "18.2", "--xcode-build-version", "17a5305f", "--out-dir", @@ -10459,7 +9485,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "svc_tests iPhone X 16.4", + "name": "rtc_stats_unittests iPhone 15 18.2", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -10473,7 +9499,6 @@ } ], "dimensions": { - "cores": "12", "cpu": "x86-64", "os": "Mac-15" }, @@ -10483,19 +9508,19 @@ "path": "Xcode.app" }, { - "name": "runtime_ios_16_4", - "path": "Runtime-ios-16.4" + "name": "runtime_ios_18_2", + "path": "Runtime-ios-18.2" } ], - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", - "shards": 4 + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, - "test": "svc_tests", - "test_id_prefix": "ninja://pc:svc_tests/", - "variant_id": "iPhone X 16.4" + "test": "rtc_stats_unittests", + "test_id_prefix": "ninja://stats:rtc_stats_unittests/", + "variant_id": "iPhone 15 18.2" }, { "args": [ + "--xcodebuild-sim-runner", "--platform", "iPhone 14", "--version", @@ -10509,7 +9534,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "system_wrappers_unittests iPhone 14 17.5", + "name": "sdk_framework_unittests iPhone 14 17.5", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -10538,12 +9563,13 @@ ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, - "test": "system_wrappers_unittests", - "test_id_prefix": "ninja://system_wrappers:system_wrappers_unittests/", + "test": "sdk_framework_unittests", + "test_id_prefix": "ninja://sdk:sdk_framework_unittests/", "variant_id": "iPhone 14 17.5" }, { "args": [ + "--xcodebuild-sim-runner", "--platform", "iPhone 15", "--version", @@ -10557,7 +9583,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "system_wrappers_unittests iPhone 15 18.2", + "name": "sdk_framework_unittests iPhone 15 18.2", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -10586,16 +9612,17 @@ ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, - "test": "system_wrappers_unittests", - "test_id_prefix": "ninja://system_wrappers:system_wrappers_unittests/", + "test": "sdk_framework_unittests", + "test_id_prefix": "ninja://sdk:sdk_framework_unittests/", "variant_id": "iPhone 15 18.2" }, { "args": [ + "--xcodebuild-sim-runner", "--platform", - "iPhone X", + "iPhone 14", "--version", - "16.4", + "17.5", "--xcode-build-version", "17a5305f", "--out-dir", @@ -10605,7 +9632,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "system_wrappers_unittests iPhone X 16.4", + "name": "sdk_unittests iPhone 14 17.5", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -10628,22 +9655,23 @@ "path": "Xcode.app" }, { - "name": "runtime_ios_16_4", - "path": "Runtime-ios-16.4" + "name": "runtime_ios_17_5", + "path": "Runtime-ios-17.5" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, - "test": "system_wrappers_unittests", - "test_id_prefix": "ninja://system_wrappers:system_wrappers_unittests/", - "variant_id": "iPhone X 16.4" + "test": "sdk_unittests", + "test_id_prefix": "ninja://sdk:sdk_unittests/", + "variant_id": "iPhone 14 17.5" }, { "args": [ + "--xcodebuild-sim-runner", "--platform", - "iPhone 14", + "iPhone 15", "--version", - "17.5", + "18.2", "--xcode-build-version", "17a5305f", "--out-dir", @@ -10653,7 +9681,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "test_support_unittests iPhone 14 17.5", + "name": "sdk_unittests iPhone 15 18.2", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -10676,22 +9704,22 @@ "path": "Xcode.app" }, { - "name": "runtime_ios_17_5", - "path": "Runtime-ios-17.5" + "name": "runtime_ios_18_2", + "path": "Runtime-ios-18.2" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, - "test": "test_support_unittests", - "test_id_prefix": "ninja://test:test_support_unittests/", - "variant_id": "iPhone 14 17.5" + "test": "sdk_unittests", + "test_id_prefix": "ninja://sdk:sdk_unittests/", + "variant_id": "iPhone 15 18.2" }, { "args": [ "--platform", - "iPhone 15", + "iPhone 14", "--version", - "18.2", + "17.5", "--xcode-build-version", "17a5305f", "--out-dir", @@ -10701,7 +9729,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "test_support_unittests iPhone 15 18.2", + "name": "svc_tests iPhone 14 17.5", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -10715,6 +9743,7 @@ } ], "dimensions": { + "cores": "12", "cpu": "x86-64", "os": "Mac-15" }, @@ -10724,22 +9753,23 @@ "path": "Xcode.app" }, { - "name": "runtime_ios_18_2", - "path": "Runtime-ios-18.2" + "name": "runtime_ios_17_5", + "path": "Runtime-ios-17.5" } ], - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", + "shards": 4 }, - "test": "test_support_unittests", - "test_id_prefix": "ninja://test:test_support_unittests/", - "variant_id": "iPhone 15 18.2" + "test": "svc_tests", + "test_id_prefix": "ninja://pc:svc_tests/", + "variant_id": "iPhone 14 17.5" }, { "args": [ "--platform", - "iPhone X", + "iPhone 15", "--version", - "16.4", + "18.2", "--xcode-build-version", "17a5305f", "--out-dir", @@ -10749,7 +9779,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "test_support_unittests iPhone X 16.4", + "name": "svc_tests iPhone 15 18.2", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -10763,6 +9793,7 @@ } ], "dimensions": { + "cores": "12", "cpu": "x86-64", "os": "Mac-15" }, @@ -10772,15 +9803,16 @@ "path": "Xcode.app" }, { - "name": "runtime_ios_16_4", - "path": "Runtime-ios-16.4" + "name": "runtime_ios_18_2", + "path": "Runtime-ios-18.2" } ], - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", + "shards": 4 }, - "test": "test_support_unittests", - "test_id_prefix": "ninja://test:test_support_unittests/", - "variant_id": "iPhone X 16.4" + "test": "svc_tests", + "test_id_prefix": "ninja://pc:svc_tests/", + "variant_id": "iPhone 15 18.2" }, { "args": [ @@ -10797,7 +9829,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "tools_unittests iPhone 14 17.5", + "name": "system_wrappers_unittests iPhone 14 17.5", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -10826,8 +9858,8 @@ ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, - "test": "tools_unittests", - "test_id_prefix": "ninja://rtc_tools:tools_unittests/", + "test": "system_wrappers_unittests", + "test_id_prefix": "ninja://system_wrappers:system_wrappers_unittests/", "variant_id": "iPhone 14 17.5" }, { @@ -10845,7 +9877,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "tools_unittests iPhone 15 18.2", + "name": "system_wrappers_unittests iPhone 15 18.2", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -10874,16 +9906,16 @@ ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, - "test": "tools_unittests", - "test_id_prefix": "ninja://rtc_tools:tools_unittests/", + "test": "system_wrappers_unittests", + "test_id_prefix": "ninja://system_wrappers:system_wrappers_unittests/", "variant_id": "iPhone 15 18.2" }, { "args": [ "--platform", - "iPhone X", + "iPhone 14", "--version", - "16.4", + "17.5", "--xcode-build-version", "17a5305f", "--out-dir", @@ -10893,7 +9925,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "tools_unittests iPhone X 16.4", + "name": "test_support_unittests iPhone 14 17.5", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -10916,22 +9948,22 @@ "path": "Xcode.app" }, { - "name": "runtime_ios_16_4", - "path": "Runtime-ios-16.4" + "name": "runtime_ios_17_5", + "path": "Runtime-ios-17.5" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, - "test": "tools_unittests", - "test_id_prefix": "ninja://rtc_tools:tools_unittests/", - "variant_id": "iPhone X 16.4" + "test": "test_support_unittests", + "test_id_prefix": "ninja://test:test_support_unittests/", + "variant_id": "iPhone 14 17.5" }, { "args": [ "--platform", - "iPhone 14", + "iPhone 15", "--version", - "17.5", + "18.2", "--xcode-build-version", "17a5305f", "--out-dir", @@ -10941,7 +9973,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "video_engine_tests iPhone 14 17.5", + "name": "test_support_unittests iPhone 15 18.2", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -10964,23 +9996,22 @@ "path": "Xcode.app" }, { - "name": "runtime_ios_17_5", - "path": "Runtime-ios-17.5" + "name": "runtime_ios_18_2", + "path": "Runtime-ios-18.2" } ], - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", - "shards": 4 + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, - "test": "video_engine_tests", - "test_id_prefix": "ninja://:video_engine_tests/", - "variant_id": "iPhone 14 17.5" + "test": "test_support_unittests", + "test_id_prefix": "ninja://test:test_support_unittests/", + "variant_id": "iPhone 15 18.2" }, { "args": [ "--platform", - "iPhone 15", + "iPhone 14", "--version", - "18.2", + "17.5", "--xcode-build-version", "17a5305f", "--out-dir", @@ -10990,7 +10021,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "video_engine_tests iPhone 15 18.2", + "name": "tools_unittests iPhone 14 17.5", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -11013,23 +10044,22 @@ "path": "Xcode.app" }, { - "name": "runtime_ios_18_2", - "path": "Runtime-ios-18.2" + "name": "runtime_ios_17_5", + "path": "Runtime-ios-17.5" } ], - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", - "shards": 4 + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, - "test": "video_engine_tests", - "test_id_prefix": "ninja://:video_engine_tests/", - "variant_id": "iPhone 15 18.2" + "test": "tools_unittests", + "test_id_prefix": "ninja://rtc_tools:tools_unittests/", + "variant_id": "iPhone 14 17.5" }, { "args": [ "--platform", - "iPhone X", + "iPhone 15", "--version", - "16.4", + "18.2", "--xcode-build-version", "17a5305f", "--out-dir", @@ -11039,7 +10069,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "video_engine_tests iPhone X 16.4", + "name": "tools_unittests iPhone 15 18.2", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -11062,16 +10092,15 @@ "path": "Xcode.app" }, { - "name": "runtime_ios_16_4", - "path": "Runtime-ios-16.4" + "name": "runtime_ios_18_2", + "path": "Runtime-ios-18.2" } ], - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", - "shards": 4 + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, - "test": "video_engine_tests", - "test_id_prefix": "ninja://:video_engine_tests/", - "variant_id": "iPhone X 16.4" + "test": "tools_unittests", + "test_id_prefix": "ninja://rtc_tools:tools_unittests/", + "variant_id": "iPhone 15 18.2" }, { "args": [ @@ -11088,7 +10117,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "voip_unittests iPhone 14 17.5", + "name": "video_engine_tests iPhone 14 17.5", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -11115,10 +10144,11 @@ "path": "Runtime-ios-17.5" } ], - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", + "shards": 4 }, - "test": "voip_unittests", - "test_id_prefix": "ninja://:voip_unittests/", + "test": "video_engine_tests", + "test_id_prefix": "ninja://:video_engine_tests/", "variant_id": "iPhone 14 17.5" }, { @@ -11136,7 +10166,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "voip_unittests iPhone 15 18.2", + "name": "video_engine_tests iPhone 15 18.2", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -11163,18 +10193,19 @@ "path": "Runtime-ios-18.2" } ], - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", + "shards": 4 }, - "test": "voip_unittests", - "test_id_prefix": "ninja://:voip_unittests/", + "test": "video_engine_tests", + "test_id_prefix": "ninja://:video_engine_tests/", "variant_id": "iPhone 15 18.2" }, { "args": [ "--platform", - "iPhone X", + "iPhone 14", "--version", - "16.4", + "17.5", "--xcode-build-version", "17a5305f", "--out-dir", @@ -11184,7 +10215,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "voip_unittests iPhone X 16.4", + "name": "voip_unittests iPhone 14 17.5", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -11207,22 +10238,22 @@ "path": "Xcode.app" }, { - "name": "runtime_ios_16_4", - "path": "Runtime-ios-16.4" + "name": "runtime_ios_17_5", + "path": "Runtime-ios-17.5" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "voip_unittests", "test_id_prefix": "ninja://:voip_unittests/", - "variant_id": "iPhone X 16.4" + "variant_id": "iPhone 14 17.5" }, { "args": [ "--platform", - "iPhone 14", + "iPhone 15", "--version", - "17.5", + "18.2", "--xcode-build-version", "17a5305f", "--out-dir", @@ -11232,7 +10263,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "webrtc_nonparallel_tests iPhone 14 17.5", + "name": "voip_unittests iPhone 15 18.2", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -11255,22 +10286,22 @@ "path": "Xcode.app" }, { - "name": "runtime_ios_17_5", - "path": "Runtime-ios-17.5" + "name": "runtime_ios_18_2", + "path": "Runtime-ios-18.2" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, - "test": "webrtc_nonparallel_tests", - "test_id_prefix": "ninja://:webrtc_nonparallel_tests/", - "variant_id": "iPhone 14 17.5" + "test": "voip_unittests", + "test_id_prefix": "ninja://:voip_unittests/", + "variant_id": "iPhone 15 18.2" }, { "args": [ "--platform", - "iPhone 15", + "iPhone 14", "--version", - "18.2", + "17.5", "--xcode-build-version", "17a5305f", "--out-dir", @@ -11280,7 +10311,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "webrtc_nonparallel_tests iPhone 15 18.2", + "name": "webrtc_nonparallel_tests iPhone 14 17.5", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -11303,22 +10334,22 @@ "path": "Xcode.app" }, { - "name": "runtime_ios_18_2", - "path": "Runtime-ios-18.2" + "name": "runtime_ios_17_5", + "path": "Runtime-ios-17.5" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "webrtc_nonparallel_tests", "test_id_prefix": "ninja://:webrtc_nonparallel_tests/", - "variant_id": "iPhone 15 18.2" + "variant_id": "iPhone 14 17.5" }, { "args": [ "--platform", - "iPhone X", + "iPhone 15", "--version", - "16.4", + "18.2", "--xcode-build-version", "17a5305f", "--out-dir", @@ -11328,7 +10359,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "webrtc_nonparallel_tests iPhone X 16.4", + "name": "webrtc_nonparallel_tests iPhone 15 18.2", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -11351,15 +10382,15 @@ "path": "Xcode.app" }, { - "name": "runtime_ios_16_4", - "path": "Runtime-ios-16.4" + "name": "runtime_ios_18_2", + "path": "Runtime-ios-18.2" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "webrtc_nonparallel_tests", "test_id_prefix": "ninja://:webrtc_nonparallel_tests/", - "variant_id": "iPhone X 16.4" + "variant_id": "iPhone 15 18.2" } ] }, diff --git a/third_party/libwebrtc/infra/specs/mixins.pyl b/third_party/libwebrtc/infra/specs/mixins.pyl @@ -83,14 +83,6 @@ } } }, - 'ios_runtime_cache_16_4': { - 'swarming': { - 'named_caches': [{ - 'name': 'runtime_ios_16_4', - 'path': 'Runtime-ios-16.4' - }] - } - }, 'ios_runtime_cache_17_5': { 'swarming': { 'named_caches': [{ diff --git a/third_party/libwebrtc/infra/specs/mixins_webrtc.pyl b/third_party/libwebrtc/infra/specs/mixins_webrtc.pyl @@ -63,16 +63,6 @@ }, }, }, - 'ios_runtime_cache_16_4': { - 'swarming': { - 'named_caches': [ - { - 'name': 'runtime_ios_16_4', - 'path': 'Runtime-ios-16.4', - }, - ], - }, - }, 'ios_runtime_cache_17_5': { 'swarming': { 'named_caches': [ diff --git a/third_party/libwebrtc/infra/specs/test_suites.pyl b/third_party/libwebrtc/infra/specs/test_suites.pyl @@ -272,7 +272,6 @@ 'ios_simulator_tests_matrix': { 'ios_simulator_tests': { 'variants': [ - 'SIM_IPHONE_X_16_4', 'SIM_IPHONE_14_17_5', 'SIM_IPHONE_15_18_2', ], diff --git a/third_party/libwebrtc/infra/specs/tryserver.webrtc.json b/third_party/libwebrtc/infra/specs/tryserver.webrtc.json @@ -2608,55 +2608,6 @@ }, { "args": [ - "--xcodebuild-sim-runner", - "--platform", - "iPhone X", - "--version", - "16.4", - "--xcode-build-version", - "17a5305f", - "--out-dir", - "${ISOLATED_OUTDIR}", - "--xctest" - ], - "merge": { - "script": "//testing/merge_scripts/standard_isolated_script_merge.py" - }, - "name": "apprtcmobile_tests iPhone X 16.4", - "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": "x86-64", - "os": "Mac-15" - }, - "named_caches": [ - { - "name": "xcode_ios_17a5305f", - "path": "Xcode.app" - }, - { - "name": "runtime_ios_16_4", - "path": "Runtime-ios-16.4" - } - ], - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "apprtcmobile_tests", - "test_id_prefix": "ninja://examples:apprtcmobile_tests/", - "variant_id": "iPhone X 16.4" - }, - { - "args": [ "--platform", "iPhone 14", "--version", @@ -2754,54 +2705,6 @@ { "args": [ "--platform", - "iPhone X", - "--version", - "16.4", - "--xcode-build-version", - "17a5305f", - "--out-dir", - "${ISOLATED_OUTDIR}", - "--xctest" - ], - "merge": { - "script": "//testing/merge_scripts/standard_isolated_script_merge.py" - }, - "name": "audio_decoder_unittests iPhone X 16.4", - "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": "x86-64", - "os": "Mac-15" - }, - "named_caches": [ - { - "name": "xcode_ios_17a5305f", - "path": "Xcode.app" - }, - { - "name": "runtime_ios_16_4", - "path": "Runtime-ios-16.4" - } - ], - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "audio_decoder_unittests", - "test_id_prefix": "ninja://modules/audio_coding:audio_decoder_unittests/", - "variant_id": "iPhone X 16.4" - }, - { - "args": [ - "--platform", "iPhone 14", "--version", "17.5", @@ -2898,9 +2801,9 @@ { "args": [ "--platform", - "iPhone X", + "iPhone 14", "--version", - "16.4", + "17.5", "--xcode-build-version", "17a5305f", "--out-dir", @@ -2910,7 +2813,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "common_audio_unittests iPhone X 16.4", + "name": "common_video_unittests iPhone 14 17.5", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -2933,22 +2836,22 @@ "path": "Xcode.app" }, { - "name": "runtime_ios_16_4", - "path": "Runtime-ios-16.4" + "name": "runtime_ios_17_5", + "path": "Runtime-ios-17.5" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, - "test": "common_audio_unittests", - "test_id_prefix": "ninja://common_audio:common_audio_unittests/", - "variant_id": "iPhone X 16.4" + "test": "common_video_unittests", + "test_id_prefix": "ninja://common_video:common_video_unittests/", + "variant_id": "iPhone 14 17.5" }, { "args": [ "--platform", - "iPhone 14", + "iPhone 15", "--version", - "17.5", + "18.2", "--xcode-build-version", "17a5305f", "--out-dir", @@ -2958,7 +2861,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "common_video_unittests iPhone 14 17.5", + "name": "common_video_unittests iPhone 15 18.2", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -2981,22 +2884,22 @@ "path": "Xcode.app" }, { - "name": "runtime_ios_17_5", - "path": "Runtime-ios-17.5" + "name": "runtime_ios_18_2", + "path": "Runtime-ios-18.2" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "common_video_unittests", "test_id_prefix": "ninja://common_video:common_video_unittests/", - "variant_id": "iPhone 14 17.5" + "variant_id": "iPhone 15 18.2" }, { "args": [ "--platform", - "iPhone 15", + "iPhone 14", "--version", - "18.2", + "17.5", "--xcode-build-version", "17a5305f", "--out-dir", @@ -3006,7 +2909,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "common_video_unittests iPhone 15 18.2", + "name": "dcsctp_unittests iPhone 14 17.5", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -3029,22 +2932,22 @@ "path": "Xcode.app" }, { - "name": "runtime_ios_18_2", - "path": "Runtime-ios-18.2" + "name": "runtime_ios_17_5", + "path": "Runtime-ios-17.5" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, - "test": "common_video_unittests", - "test_id_prefix": "ninja://common_video:common_video_unittests/", - "variant_id": "iPhone 15 18.2" + "test": "dcsctp_unittests", + "test_id_prefix": "ninja://net/dcsctp:dcsctp_unittests/", + "variant_id": "iPhone 14 17.5" }, { "args": [ "--platform", - "iPhone X", + "iPhone 15", "--version", - "16.4", + "18.2", "--xcode-build-version", "17a5305f", "--out-dir", @@ -3054,7 +2957,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "common_video_unittests iPhone X 16.4", + "name": "dcsctp_unittests iPhone 15 18.2", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -3077,15 +2980,15 @@ "path": "Xcode.app" }, { - "name": "runtime_ios_16_4", - "path": "Runtime-ios-16.4" + "name": "runtime_ios_18_2", + "path": "Runtime-ios-18.2" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, - "test": "common_video_unittests", - "test_id_prefix": "ninja://common_video:common_video_unittests/", - "variant_id": "iPhone X 16.4" + "test": "dcsctp_unittests", + "test_id_prefix": "ninja://net/dcsctp:dcsctp_unittests/", + "variant_id": "iPhone 15 18.2" }, { "args": [ @@ -3102,7 +3005,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "dcsctp_unittests iPhone 14 17.5", + "name": "modules_tests iPhone 14 17.5", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -3129,10 +3032,11 @@ "path": "Runtime-ios-17.5" } ], - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", + "shards": 2 }, - "test": "dcsctp_unittests", - "test_id_prefix": "ninja://net/dcsctp:dcsctp_unittests/", + "test": "modules_tests", + "test_id_prefix": "ninja://modules:modules_tests/", "variant_id": "iPhone 14 17.5" }, { @@ -3150,7 +3054,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "dcsctp_unittests iPhone 15 18.2", + "name": "modules_tests iPhone 15 18.2", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -3177,18 +3081,19 @@ "path": "Runtime-ios-18.2" } ], - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", + "shards": 2 }, - "test": "dcsctp_unittests", - "test_id_prefix": "ninja://net/dcsctp:dcsctp_unittests/", + "test": "modules_tests", + "test_id_prefix": "ninja://modules:modules_tests/", "variant_id": "iPhone 15 18.2" }, { "args": [ "--platform", - "iPhone X", + "iPhone 14", "--version", - "16.4", + "17.5", "--xcode-build-version", "17a5305f", "--out-dir", @@ -3198,7 +3103,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "dcsctp_unittests iPhone X 16.4", + "name": "modules_unittests iPhone 14 17.5", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -3212,6 +3117,7 @@ } ], "dimensions": { + "cores": "12", "cpu": "x86-64", "os": "Mac-15" }, @@ -3221,22 +3127,23 @@ "path": "Xcode.app" }, { - "name": "runtime_ios_16_4", - "path": "Runtime-ios-16.4" + "name": "runtime_ios_17_5", + "path": "Runtime-ios-17.5" } ], - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", + "shards": 6 }, - "test": "dcsctp_unittests", - "test_id_prefix": "ninja://net/dcsctp:dcsctp_unittests/", - "variant_id": "iPhone X 16.4" + "test": "modules_unittests", + "test_id_prefix": "ninja://modules:modules_unittests/", + "variant_id": "iPhone 14 17.5" }, { "args": [ "--platform", - "iPhone 14", + "iPhone 15", "--version", - "17.5", + "18.2", "--xcode-build-version", "17a5305f", "--out-dir", @@ -3246,7 +3153,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "modules_tests iPhone 14 17.5", + "name": "modules_unittests iPhone 15 18.2", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -3260,6 +3167,7 @@ } ], "dimensions": { + "cores": "12", "cpu": "x86-64", "os": "Mac-15" }, @@ -3269,23 +3177,23 @@ "path": "Xcode.app" }, { - "name": "runtime_ios_17_5", - "path": "Runtime-ios-17.5" + "name": "runtime_ios_18_2", + "path": "Runtime-ios-18.2" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", - "shards": 2 + "shards": 6 }, - "test": "modules_tests", - "test_id_prefix": "ninja://modules:modules_tests/", - "variant_id": "iPhone 14 17.5" + "test": "modules_unittests", + "test_id_prefix": "ninja://modules:modules_unittests/", + "variant_id": "iPhone 15 18.2" }, { "args": [ "--platform", - "iPhone 15", + "iPhone 14", "--version", - "18.2", + "17.5", "--xcode-build-version", "17a5305f", "--out-dir", @@ -3295,7 +3203,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "modules_tests iPhone 15 18.2", + "name": "rtc_media_unittests iPhone 14 17.5", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -3318,23 +3226,22 @@ "path": "Xcode.app" }, { - "name": "runtime_ios_18_2", - "path": "Runtime-ios-18.2" + "name": "runtime_ios_17_5", + "path": "Runtime-ios-17.5" } ], - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", - "shards": 2 + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, - "test": "modules_tests", - "test_id_prefix": "ninja://modules:modules_tests/", - "variant_id": "iPhone 15 18.2" + "test": "rtc_media_unittests", + "test_id_prefix": "ninja://media:rtc_media_unittests/", + "variant_id": "iPhone 14 17.5" }, { "args": [ "--platform", - "iPhone X", + "iPhone 15", "--version", - "16.4", + "18.2", "--xcode-build-version", "17a5305f", "--out-dir", @@ -3344,7 +3251,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "modules_tests iPhone X 16.4", + "name": "rtc_media_unittests iPhone 15 18.2", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -3367,16 +3274,15 @@ "path": "Xcode.app" }, { - "name": "runtime_ios_16_4", - "path": "Runtime-ios-16.4" + "name": "runtime_ios_18_2", + "path": "Runtime-ios-18.2" } ], - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", - "shards": 2 + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, - "test": "modules_tests", - "test_id_prefix": "ninja://modules:modules_tests/", - "variant_id": "iPhone X 16.4" + "test": "rtc_media_unittests", + "test_id_prefix": "ninja://media:rtc_media_unittests/", + "variant_id": "iPhone 15 18.2" }, { "args": [ @@ -3393,7 +3299,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "modules_unittests iPhone 14 17.5", + "name": "rtc_p2p_unittests iPhone 14 17.5", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -3407,7 +3313,6 @@ } ], "dimensions": { - "cores": "12", "cpu": "x86-64", "os": "Mac-15" }, @@ -3421,11 +3326,10 @@ "path": "Runtime-ios-17.5" } ], - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", - "shards": 6 + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, - "test": "modules_unittests", - "test_id_prefix": "ninja://modules:modules_unittests/", + "test": "rtc_p2p_unittests", + "test_id_prefix": "ninja://:rtc_p2p_unittests/", "variant_id": "iPhone 14 17.5" }, { @@ -3443,7 +3347,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "modules_unittests iPhone 15 18.2", + "name": "rtc_p2p_unittests iPhone 15 18.2", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -3457,7 +3361,6 @@ } ], "dimensions": { - "cores": "12", "cpu": "x86-64", "os": "Mac-15" }, @@ -3471,19 +3374,18 @@ "path": "Runtime-ios-18.2" } ], - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", - "shards": 6 + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, - "test": "modules_unittests", - "test_id_prefix": "ninja://modules:modules_unittests/", + "test": "rtc_p2p_unittests", + "test_id_prefix": "ninja://:rtc_p2p_unittests/", "variant_id": "iPhone 15 18.2" }, { "args": [ "--platform", - "iPhone X", + "iPhone 14", "--version", - "16.4", + "17.5", "--xcode-build-version", "17a5305f", "--out-dir", @@ -3493,7 +3395,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "modules_unittests iPhone X 16.4", + "name": "rtc_pc_unittests iPhone 14 17.5", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -3507,7 +3409,6 @@ } ], "dimensions": { - "cores": "12", "cpu": "x86-64", "os": "Mac-15" }, @@ -3517,23 +3418,22 @@ "path": "Xcode.app" }, { - "name": "runtime_ios_16_4", - "path": "Runtime-ios-16.4" + "name": "runtime_ios_17_5", + "path": "Runtime-ios-17.5" } ], - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", - "shards": 6 + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, - "test": "modules_unittests", - "test_id_prefix": "ninja://modules:modules_unittests/", - "variant_id": "iPhone X 16.4" + "test": "rtc_pc_unittests", + "test_id_prefix": "ninja://pc:rtc_pc_unittests/", + "variant_id": "iPhone 14 17.5" }, { "args": [ "--platform", - "iPhone 14", + "iPhone 15", "--version", - "17.5", + "18.2", "--xcode-build-version", "17a5305f", "--out-dir", @@ -3543,877 +3443,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "rtc_media_unittests 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": "x86-64", - "os": "Mac-15" - }, - "named_caches": [ - { - "name": "xcode_ios_17a5305f", - "path": "Xcode.app" - }, - { - "name": "runtime_ios_17_5", - "path": "Runtime-ios-17.5" - } - ], - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "rtc_media_unittests", - "test_id_prefix": "ninja://media:rtc_media_unittests/", - "variant_id": "iPhone 14 17.5" - }, - { - "args": [ - "--platform", - "iPhone 15", - "--version", - "18.2", - "--xcode-build-version", - "17a5305f", - "--out-dir", - "${ISOLATED_OUTDIR}", - "--xctest" - ], - "merge": { - "script": "//testing/merge_scripts/standard_isolated_script_merge.py" - }, - "name": "rtc_media_unittests 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": "x86-64", - "os": "Mac-15" - }, - "named_caches": [ - { - "name": "xcode_ios_17a5305f", - "path": "Xcode.app" - }, - { - "name": "runtime_ios_18_2", - "path": "Runtime-ios-18.2" - } - ], - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "rtc_media_unittests", - "test_id_prefix": "ninja://media:rtc_media_unittests/", - "variant_id": "iPhone 15 18.2" - }, - { - "args": [ - "--platform", - "iPhone X", - "--version", - "16.4", - "--xcode-build-version", - "17a5305f", - "--out-dir", - "${ISOLATED_OUTDIR}", - "--xctest" - ], - "merge": { - "script": "//testing/merge_scripts/standard_isolated_script_merge.py" - }, - "name": "rtc_media_unittests iPhone X 16.4", - "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": "x86-64", - "os": "Mac-15" - }, - "named_caches": [ - { - "name": "xcode_ios_17a5305f", - "path": "Xcode.app" - }, - { - "name": "runtime_ios_16_4", - "path": "Runtime-ios-16.4" - } - ], - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "rtc_media_unittests", - "test_id_prefix": "ninja://media:rtc_media_unittests/", - "variant_id": "iPhone X 16.4" - }, - { - "args": [ - "--platform", - "iPhone 14", - "--version", - "17.5", - "--xcode-build-version", - "17a5305f", - "--out-dir", - "${ISOLATED_OUTDIR}", - "--xctest" - ], - "merge": { - "script": "//testing/merge_scripts/standard_isolated_script_merge.py" - }, - "name": "rtc_p2p_unittests 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": "x86-64", - "os": "Mac-15" - }, - "named_caches": [ - { - "name": "xcode_ios_17a5305f", - "path": "Xcode.app" - }, - { - "name": "runtime_ios_17_5", - "path": "Runtime-ios-17.5" - } - ], - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "rtc_p2p_unittests", - "test_id_prefix": "ninja://:rtc_p2p_unittests/", - "variant_id": "iPhone 14 17.5" - }, - { - "args": [ - "--platform", - "iPhone 15", - "--version", - "18.2", - "--xcode-build-version", - "17a5305f", - "--out-dir", - "${ISOLATED_OUTDIR}", - "--xctest" - ], - "merge": { - "script": "//testing/merge_scripts/standard_isolated_script_merge.py" - }, - "name": "rtc_p2p_unittests 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": "x86-64", - "os": "Mac-15" - }, - "named_caches": [ - { - "name": "xcode_ios_17a5305f", - "path": "Xcode.app" - }, - { - "name": "runtime_ios_18_2", - "path": "Runtime-ios-18.2" - } - ], - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "rtc_p2p_unittests", - "test_id_prefix": "ninja://:rtc_p2p_unittests/", - "variant_id": "iPhone 15 18.2" - }, - { - "args": [ - "--platform", - "iPhone X", - "--version", - "16.4", - "--xcode-build-version", - "17a5305f", - "--out-dir", - "${ISOLATED_OUTDIR}", - "--xctest" - ], - "merge": { - "script": "//testing/merge_scripts/standard_isolated_script_merge.py" - }, - "name": "rtc_p2p_unittests iPhone X 16.4", - "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": "x86-64", - "os": "Mac-15" - }, - "named_caches": [ - { - "name": "xcode_ios_17a5305f", - "path": "Xcode.app" - }, - { - "name": "runtime_ios_16_4", - "path": "Runtime-ios-16.4" - } - ], - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "rtc_p2p_unittests", - "test_id_prefix": "ninja://:rtc_p2p_unittests/", - "variant_id": "iPhone X 16.4" - }, - { - "args": [ - "--platform", - "iPhone 14", - "--version", - "17.5", - "--xcode-build-version", - "17a5305f", - "--out-dir", - "${ISOLATED_OUTDIR}", - "--xctest" - ], - "merge": { - "script": "//testing/merge_scripts/standard_isolated_script_merge.py" - }, - "name": "rtc_pc_unittests 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": "x86-64", - "os": "Mac-15" - }, - "named_caches": [ - { - "name": "xcode_ios_17a5305f", - "path": "Xcode.app" - }, - { - "name": "runtime_ios_17_5", - "path": "Runtime-ios-17.5" - } - ], - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "rtc_pc_unittests", - "test_id_prefix": "ninja://pc:rtc_pc_unittests/", - "variant_id": "iPhone 14 17.5" - }, - { - "args": [ - "--platform", - "iPhone 15", - "--version", - "18.2", - "--xcode-build-version", - "17a5305f", - "--out-dir", - "${ISOLATED_OUTDIR}", - "--xctest" - ], - "merge": { - "script": "//testing/merge_scripts/standard_isolated_script_merge.py" - }, - "name": "rtc_pc_unittests 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": "x86-64", - "os": "Mac-15" - }, - "named_caches": [ - { - "name": "xcode_ios_17a5305f", - "path": "Xcode.app" - }, - { - "name": "runtime_ios_18_2", - "path": "Runtime-ios-18.2" - } - ], - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "rtc_pc_unittests", - "test_id_prefix": "ninja://pc:rtc_pc_unittests/", - "variant_id": "iPhone 15 18.2" - }, - { - "args": [ - "--platform", - "iPhone X", - "--version", - "16.4", - "--xcode-build-version", - "17a5305f", - "--out-dir", - "${ISOLATED_OUTDIR}", - "--xctest" - ], - "merge": { - "script": "//testing/merge_scripts/standard_isolated_script_merge.py" - }, - "name": "rtc_pc_unittests iPhone X 16.4", - "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": "x86-64", - "os": "Mac-15" - }, - "named_caches": [ - { - "name": "xcode_ios_17a5305f", - "path": "Xcode.app" - }, - { - "name": "runtime_ios_16_4", - "path": "Runtime-ios-16.4" - } - ], - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "rtc_pc_unittests", - "test_id_prefix": "ninja://pc:rtc_pc_unittests/", - "variant_id": "iPhone X 16.4" - }, - { - "args": [ - "--platform", - "iPhone 14", - "--version", - "17.5", - "--xcode-build-version", - "17a5305f", - "--out-dir", - "${ISOLATED_OUTDIR}", - "--xctest" - ], - "merge": { - "script": "//testing/merge_scripts/standard_isolated_script_merge.py" - }, - "name": "rtc_stats_unittests 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": "x86-64", - "os": "Mac-15" - }, - "named_caches": [ - { - "name": "xcode_ios_17a5305f", - "path": "Xcode.app" - }, - { - "name": "runtime_ios_17_5", - "path": "Runtime-ios-17.5" - } - ], - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "rtc_stats_unittests", - "test_id_prefix": "ninja://stats:rtc_stats_unittests/", - "variant_id": "iPhone 14 17.5" - }, - { - "args": [ - "--platform", - "iPhone 15", - "--version", - "18.2", - "--xcode-build-version", - "17a5305f", - "--out-dir", - "${ISOLATED_OUTDIR}", - "--xctest" - ], - "merge": { - "script": "//testing/merge_scripts/standard_isolated_script_merge.py" - }, - "name": "rtc_stats_unittests 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": "x86-64", - "os": "Mac-15" - }, - "named_caches": [ - { - "name": "xcode_ios_17a5305f", - "path": "Xcode.app" - }, - { - "name": "runtime_ios_18_2", - "path": "Runtime-ios-18.2" - } - ], - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "rtc_stats_unittests", - "test_id_prefix": "ninja://stats:rtc_stats_unittests/", - "variant_id": "iPhone 15 18.2" - }, - { - "args": [ - "--platform", - "iPhone X", - "--version", - "16.4", - "--xcode-build-version", - "17a5305f", - "--out-dir", - "${ISOLATED_OUTDIR}", - "--xctest" - ], - "merge": { - "script": "//testing/merge_scripts/standard_isolated_script_merge.py" - }, - "name": "rtc_stats_unittests iPhone X 16.4", - "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": "x86-64", - "os": "Mac-15" - }, - "named_caches": [ - { - "name": "xcode_ios_17a5305f", - "path": "Xcode.app" - }, - { - "name": "runtime_ios_16_4", - "path": "Runtime-ios-16.4" - } - ], - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "rtc_stats_unittests", - "test_id_prefix": "ninja://stats:rtc_stats_unittests/", - "variant_id": "iPhone X 16.4" - }, - { - "args": [ - "--xcodebuild-sim-runner", - "--platform", - "iPhone 14", - "--version", - "17.5", - "--xcode-build-version", - "17a5305f", - "--out-dir", - "${ISOLATED_OUTDIR}", - "--xctest" - ], - "merge": { - "script": "//testing/merge_scripts/standard_isolated_script_merge.py" - }, - "name": "sdk_framework_unittests 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": "x86-64", - "os": "Mac-15" - }, - "named_caches": [ - { - "name": "xcode_ios_17a5305f", - "path": "Xcode.app" - }, - { - "name": "runtime_ios_17_5", - "path": "Runtime-ios-17.5" - } - ], - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "sdk_framework_unittests", - "test_id_prefix": "ninja://sdk:sdk_framework_unittests/", - "variant_id": "iPhone 14 17.5" - }, - { - "args": [ - "--xcodebuild-sim-runner", - "--platform", - "iPhone 15", - "--version", - "18.2", - "--xcode-build-version", - "17a5305f", - "--out-dir", - "${ISOLATED_OUTDIR}", - "--xctest" - ], - "merge": { - "script": "//testing/merge_scripts/standard_isolated_script_merge.py" - }, - "name": "sdk_framework_unittests 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": "x86-64", - "os": "Mac-15" - }, - "named_caches": [ - { - "name": "xcode_ios_17a5305f", - "path": "Xcode.app" - }, - { - "name": "runtime_ios_18_2", - "path": "Runtime-ios-18.2" - } - ], - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "sdk_framework_unittests", - "test_id_prefix": "ninja://sdk:sdk_framework_unittests/", - "variant_id": "iPhone 15 18.2" - }, - { - "args": [ - "--xcodebuild-sim-runner", - "--platform", - "iPhone X", - "--version", - "16.4", - "--xcode-build-version", - "17a5305f", - "--out-dir", - "${ISOLATED_OUTDIR}", - "--xctest" - ], - "merge": { - "script": "//testing/merge_scripts/standard_isolated_script_merge.py" - }, - "name": "sdk_framework_unittests iPhone X 16.4", - "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": "x86-64", - "os": "Mac-15" - }, - "named_caches": [ - { - "name": "xcode_ios_17a5305f", - "path": "Xcode.app" - }, - { - "name": "runtime_ios_16_4", - "path": "Runtime-ios-16.4" - } - ], - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "sdk_framework_unittests", - "test_id_prefix": "ninja://sdk:sdk_framework_unittests/", - "variant_id": "iPhone X 16.4" - }, - { - "args": [ - "--xcodebuild-sim-runner", - "--platform", - "iPhone 14", - "--version", - "17.5", - "--xcode-build-version", - "17a5305f", - "--out-dir", - "${ISOLATED_OUTDIR}", - "--xctest" - ], - "merge": { - "script": "//testing/merge_scripts/standard_isolated_script_merge.py" - }, - "name": "sdk_unittests 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": "x86-64", - "os": "Mac-15" - }, - "named_caches": [ - { - "name": "xcode_ios_17a5305f", - "path": "Xcode.app" - }, - { - "name": "runtime_ios_17_5", - "path": "Runtime-ios-17.5" - } - ], - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "sdk_unittests", - "test_id_prefix": "ninja://sdk:sdk_unittests/", - "variant_id": "iPhone 14 17.5" - }, - { - "args": [ - "--xcodebuild-sim-runner", - "--platform", - "iPhone 15", - "--version", - "18.2", - "--xcode-build-version", - "17a5305f", - "--out-dir", - "${ISOLATED_OUTDIR}", - "--xctest" - ], - "merge": { - "script": "//testing/merge_scripts/standard_isolated_script_merge.py" - }, - "name": "sdk_unittests 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": "x86-64", - "os": "Mac-15" - }, - "named_caches": [ - { - "name": "xcode_ios_17a5305f", - "path": "Xcode.app" - }, - { - "name": "runtime_ios_18_2", - "path": "Runtime-ios-18.2" - } - ], - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "sdk_unittests", - "test_id_prefix": "ninja://sdk:sdk_unittests/", - "variant_id": "iPhone 15 18.2" - }, - { - "args": [ - "--xcodebuild-sim-runner", - "--platform", - "iPhone X", - "--version", - "16.4", - "--xcode-build-version", - "17a5305f", - "--out-dir", - "${ISOLATED_OUTDIR}", - "--xctest" - ], - "merge": { - "script": "//testing/merge_scripts/standard_isolated_script_merge.py" - }, - "name": "sdk_unittests iPhone X 16.4", - "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": "x86-64", - "os": "Mac-15" - }, - "named_caches": [ - { - "name": "xcode_ios_17a5305f", - "path": "Xcode.app" - }, - { - "name": "runtime_ios_16_4", - "path": "Runtime-ios-16.4" - } - ], - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" - }, - "test": "sdk_unittests", - "test_id_prefix": "ninja://sdk:sdk_unittests/", - "variant_id": "iPhone X 16.4" - }, - { - "args": [ - "--platform", - "iPhone 14", - "--version", - "17.5", - "--xcode-build-version", - "17a5305f", - "--out-dir", - "${ISOLATED_OUTDIR}", - "--xctest" - ], - "merge": { - "script": "//testing/merge_scripts/standard_isolated_script_merge.py" - }, - "name": "svc_tests iPhone 14 17.5", + "name": "rtc_pc_unittests iPhone 15 18.2", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -4427,7 +3457,6 @@ } ], "dimensions": { - "cores": "12", "cpu": "x86-64", "os": "Mac-15" }, @@ -4437,23 +3466,22 @@ "path": "Xcode.app" }, { - "name": "runtime_ios_17_5", - "path": "Runtime-ios-17.5" + "name": "runtime_ios_18_2", + "path": "Runtime-ios-18.2" } ], - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", - "shards": 4 + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, - "test": "svc_tests", - "test_id_prefix": "ninja://pc:svc_tests/", - "variant_id": "iPhone 14 17.5" + "test": "rtc_pc_unittests", + "test_id_prefix": "ninja://pc:rtc_pc_unittests/", + "variant_id": "iPhone 15 18.2" }, { "args": [ "--platform", - "iPhone 15", + "iPhone 14", "--version", - "18.2", + "17.5", "--xcode-build-version", "17a5305f", "--out-dir", @@ -4463,7 +3491,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "svc_tests iPhone 15 18.2", + "name": "rtc_stats_unittests iPhone 14 17.5", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -4477,7 +3505,6 @@ } ], "dimensions": { - "cores": "12", "cpu": "x86-64", "os": "Mac-15" }, @@ -4487,23 +3514,22 @@ "path": "Xcode.app" }, { - "name": "runtime_ios_18_2", - "path": "Runtime-ios-18.2" + "name": "runtime_ios_17_5", + "path": "Runtime-ios-17.5" } ], - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", - "shards": 4 + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, - "test": "svc_tests", - "test_id_prefix": "ninja://pc:svc_tests/", - "variant_id": "iPhone 15 18.2" + "test": "rtc_stats_unittests", + "test_id_prefix": "ninja://stats:rtc_stats_unittests/", + "variant_id": "iPhone 14 17.5" }, { "args": [ "--platform", - "iPhone X", + "iPhone 15", "--version", - "16.4", + "18.2", "--xcode-build-version", "17a5305f", "--out-dir", @@ -4513,7 +3539,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "svc_tests iPhone X 16.4", + "name": "rtc_stats_unittests iPhone 15 18.2", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -4527,7 +3553,6 @@ } ], "dimensions": { - "cores": "12", "cpu": "x86-64", "os": "Mac-15" }, @@ -4537,19 +3562,19 @@ "path": "Xcode.app" }, { - "name": "runtime_ios_16_4", - "path": "Runtime-ios-16.4" + "name": "runtime_ios_18_2", + "path": "Runtime-ios-18.2" } ], - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", - "shards": 4 + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, - "test": "svc_tests", - "test_id_prefix": "ninja://pc:svc_tests/", - "variant_id": "iPhone X 16.4" + "test": "rtc_stats_unittests", + "test_id_prefix": "ninja://stats:rtc_stats_unittests/", + "variant_id": "iPhone 15 18.2" }, { "args": [ + "--xcodebuild-sim-runner", "--platform", "iPhone 14", "--version", @@ -4563,7 +3588,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "system_wrappers_unittests iPhone 14 17.5", + "name": "sdk_framework_unittests iPhone 14 17.5", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -4592,12 +3617,13 @@ ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, - "test": "system_wrappers_unittests", - "test_id_prefix": "ninja://system_wrappers:system_wrappers_unittests/", + "test": "sdk_framework_unittests", + "test_id_prefix": "ninja://sdk:sdk_framework_unittests/", "variant_id": "iPhone 14 17.5" }, { "args": [ + "--xcodebuild-sim-runner", "--platform", "iPhone 15", "--version", @@ -4611,7 +3637,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "system_wrappers_unittests iPhone 15 18.2", + "name": "sdk_framework_unittests iPhone 15 18.2", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -4640,16 +3666,17 @@ ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, - "test": "system_wrappers_unittests", - "test_id_prefix": "ninja://system_wrappers:system_wrappers_unittests/", + "test": "sdk_framework_unittests", + "test_id_prefix": "ninja://sdk:sdk_framework_unittests/", "variant_id": "iPhone 15 18.2" }, { "args": [ + "--xcodebuild-sim-runner", "--platform", - "iPhone X", + "iPhone 14", "--version", - "16.4", + "17.5", "--xcode-build-version", "17a5305f", "--out-dir", @@ -4659,7 +3686,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "system_wrappers_unittests iPhone X 16.4", + "name": "sdk_unittests iPhone 14 17.5", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -4682,22 +3709,23 @@ "path": "Xcode.app" }, { - "name": "runtime_ios_16_4", - "path": "Runtime-ios-16.4" + "name": "runtime_ios_17_5", + "path": "Runtime-ios-17.5" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, - "test": "system_wrappers_unittests", - "test_id_prefix": "ninja://system_wrappers:system_wrappers_unittests/", - "variant_id": "iPhone X 16.4" + "test": "sdk_unittests", + "test_id_prefix": "ninja://sdk:sdk_unittests/", + "variant_id": "iPhone 14 17.5" }, { "args": [ + "--xcodebuild-sim-runner", "--platform", - "iPhone 14", + "iPhone 15", "--version", - "17.5", + "18.2", "--xcode-build-version", "17a5305f", "--out-dir", @@ -4707,7 +3735,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "test_support_unittests iPhone 14 17.5", + "name": "sdk_unittests iPhone 15 18.2", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -4730,22 +3758,22 @@ "path": "Xcode.app" }, { - "name": "runtime_ios_17_5", - "path": "Runtime-ios-17.5" + "name": "runtime_ios_18_2", + "path": "Runtime-ios-18.2" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, - "test": "test_support_unittests", - "test_id_prefix": "ninja://test:test_support_unittests/", - "variant_id": "iPhone 14 17.5" + "test": "sdk_unittests", + "test_id_prefix": "ninja://sdk:sdk_unittests/", + "variant_id": "iPhone 15 18.2" }, { "args": [ "--platform", - "iPhone 15", + "iPhone 14", "--version", - "18.2", + "17.5", "--xcode-build-version", "17a5305f", "--out-dir", @@ -4755,7 +3783,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "test_support_unittests iPhone 15 18.2", + "name": "svc_tests iPhone 14 17.5", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -4769,6 +3797,7 @@ } ], "dimensions": { + "cores": "12", "cpu": "x86-64", "os": "Mac-15" }, @@ -4778,22 +3807,23 @@ "path": "Xcode.app" }, { - "name": "runtime_ios_18_2", - "path": "Runtime-ios-18.2" + "name": "runtime_ios_17_5", + "path": "Runtime-ios-17.5" } ], - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", + "shards": 4 }, - "test": "test_support_unittests", - "test_id_prefix": "ninja://test:test_support_unittests/", - "variant_id": "iPhone 15 18.2" + "test": "svc_tests", + "test_id_prefix": "ninja://pc:svc_tests/", + "variant_id": "iPhone 14 17.5" }, { "args": [ "--platform", - "iPhone X", + "iPhone 15", "--version", - "16.4", + "18.2", "--xcode-build-version", "17a5305f", "--out-dir", @@ -4803,7 +3833,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "test_support_unittests iPhone X 16.4", + "name": "svc_tests iPhone 15 18.2", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -4817,6 +3847,7 @@ } ], "dimensions": { + "cores": "12", "cpu": "x86-64", "os": "Mac-15" }, @@ -4826,15 +3857,16 @@ "path": "Xcode.app" }, { - "name": "runtime_ios_16_4", - "path": "Runtime-ios-16.4" + "name": "runtime_ios_18_2", + "path": "Runtime-ios-18.2" } ], - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", + "shards": 4 }, - "test": "test_support_unittests", - "test_id_prefix": "ninja://test:test_support_unittests/", - "variant_id": "iPhone X 16.4" + "test": "svc_tests", + "test_id_prefix": "ninja://pc:svc_tests/", + "variant_id": "iPhone 15 18.2" }, { "args": [ @@ -4851,7 +3883,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "tools_unittests iPhone 14 17.5", + "name": "system_wrappers_unittests iPhone 14 17.5", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -4880,8 +3912,8 @@ ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, - "test": "tools_unittests", - "test_id_prefix": "ninja://rtc_tools:tools_unittests/", + "test": "system_wrappers_unittests", + "test_id_prefix": "ninja://system_wrappers:system_wrappers_unittests/", "variant_id": "iPhone 14 17.5" }, { @@ -4899,7 +3931,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "tools_unittests iPhone 15 18.2", + "name": "system_wrappers_unittests iPhone 15 18.2", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -4928,16 +3960,16 @@ ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, - "test": "tools_unittests", - "test_id_prefix": "ninja://rtc_tools:tools_unittests/", + "test": "system_wrappers_unittests", + "test_id_prefix": "ninja://system_wrappers:system_wrappers_unittests/", "variant_id": "iPhone 15 18.2" }, { "args": [ "--platform", - "iPhone X", + "iPhone 14", "--version", - "16.4", + "17.5", "--xcode-build-version", "17a5305f", "--out-dir", @@ -4947,7 +3979,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "tools_unittests iPhone X 16.4", + "name": "test_support_unittests iPhone 14 17.5", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -4970,22 +4002,22 @@ "path": "Xcode.app" }, { - "name": "runtime_ios_16_4", - "path": "Runtime-ios-16.4" + "name": "runtime_ios_17_5", + "path": "Runtime-ios-17.5" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, - "test": "tools_unittests", - "test_id_prefix": "ninja://rtc_tools:tools_unittests/", - "variant_id": "iPhone X 16.4" + "test": "test_support_unittests", + "test_id_prefix": "ninja://test:test_support_unittests/", + "variant_id": "iPhone 14 17.5" }, { "args": [ "--platform", - "iPhone 14", + "iPhone 15", "--version", - "17.5", + "18.2", "--xcode-build-version", "17a5305f", "--out-dir", @@ -4995,7 +4027,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "video_engine_tests iPhone 14 17.5", + "name": "test_support_unittests iPhone 15 18.2", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -5018,23 +4050,22 @@ "path": "Xcode.app" }, { - "name": "runtime_ios_17_5", - "path": "Runtime-ios-17.5" + "name": "runtime_ios_18_2", + "path": "Runtime-ios-18.2" } ], - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", - "shards": 4 + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, - "test": "video_engine_tests", - "test_id_prefix": "ninja://:video_engine_tests/", - "variant_id": "iPhone 14 17.5" + "test": "test_support_unittests", + "test_id_prefix": "ninja://test:test_support_unittests/", + "variant_id": "iPhone 15 18.2" }, { "args": [ "--platform", - "iPhone 15", + "iPhone 14", "--version", - "18.2", + "17.5", "--xcode-build-version", "17a5305f", "--out-dir", @@ -5044,7 +4075,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "video_engine_tests iPhone 15 18.2", + "name": "tools_unittests iPhone 14 17.5", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -5067,23 +4098,22 @@ "path": "Xcode.app" }, { - "name": "runtime_ios_18_2", - "path": "Runtime-ios-18.2" + "name": "runtime_ios_17_5", + "path": "Runtime-ios-17.5" } ], - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", - "shards": 4 + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, - "test": "video_engine_tests", - "test_id_prefix": "ninja://:video_engine_tests/", - "variant_id": "iPhone 15 18.2" + "test": "tools_unittests", + "test_id_prefix": "ninja://rtc_tools:tools_unittests/", + "variant_id": "iPhone 14 17.5" }, { "args": [ "--platform", - "iPhone X", + "iPhone 15", "--version", - "16.4", + "18.2", "--xcode-build-version", "17a5305f", "--out-dir", @@ -5093,7 +4123,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "video_engine_tests iPhone X 16.4", + "name": "tools_unittests iPhone 15 18.2", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -5116,16 +4146,15 @@ "path": "Xcode.app" }, { - "name": "runtime_ios_16_4", - "path": "Runtime-ios-16.4" + "name": "runtime_ios_18_2", + "path": "Runtime-ios-18.2" } ], - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", - "shards": 4 + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, - "test": "video_engine_tests", - "test_id_prefix": "ninja://:video_engine_tests/", - "variant_id": "iPhone X 16.4" + "test": "tools_unittests", + "test_id_prefix": "ninja://rtc_tools:tools_unittests/", + "variant_id": "iPhone 15 18.2" }, { "args": [ @@ -5142,7 +4171,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "voip_unittests iPhone 14 17.5", + "name": "video_engine_tests iPhone 14 17.5", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -5169,10 +4198,11 @@ "path": "Runtime-ios-17.5" } ], - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", + "shards": 4 }, - "test": "voip_unittests", - "test_id_prefix": "ninja://:voip_unittests/", + "test": "video_engine_tests", + "test_id_prefix": "ninja://:video_engine_tests/", "variant_id": "iPhone 14 17.5" }, { @@ -5190,7 +4220,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "voip_unittests iPhone 15 18.2", + "name": "video_engine_tests iPhone 15 18.2", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -5217,18 +4247,19 @@ "path": "Runtime-ios-18.2" } ], - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", + "shards": 4 }, - "test": "voip_unittests", - "test_id_prefix": "ninja://:voip_unittests/", + "test": "video_engine_tests", + "test_id_prefix": "ninja://:video_engine_tests/", "variant_id": "iPhone 15 18.2" }, { "args": [ "--platform", - "iPhone X", + "iPhone 14", "--version", - "16.4", + "17.5", "--xcode-build-version", "17a5305f", "--out-dir", @@ -5238,7 +4269,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "voip_unittests iPhone X 16.4", + "name": "voip_unittests iPhone 14 17.5", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -5261,22 +4292,22 @@ "path": "Xcode.app" }, { - "name": "runtime_ios_16_4", - "path": "Runtime-ios-16.4" + "name": "runtime_ios_17_5", + "path": "Runtime-ios-17.5" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "voip_unittests", "test_id_prefix": "ninja://:voip_unittests/", - "variant_id": "iPhone X 16.4" + "variant_id": "iPhone 14 17.5" }, { "args": [ "--platform", - "iPhone 14", + "iPhone 15", "--version", - "17.5", + "18.2", "--xcode-build-version", "17a5305f", "--out-dir", @@ -5286,7 +4317,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "webrtc_nonparallel_tests iPhone 14 17.5", + "name": "voip_unittests iPhone 15 18.2", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -5309,22 +4340,22 @@ "path": "Xcode.app" }, { - "name": "runtime_ios_17_5", - "path": "Runtime-ios-17.5" + "name": "runtime_ios_18_2", + "path": "Runtime-ios-18.2" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, - "test": "webrtc_nonparallel_tests", - "test_id_prefix": "ninja://:webrtc_nonparallel_tests/", - "variant_id": "iPhone 14 17.5" + "test": "voip_unittests", + "test_id_prefix": "ninja://:voip_unittests/", + "variant_id": "iPhone 15 18.2" }, { "args": [ "--platform", - "iPhone 15", + "iPhone 14", "--version", - "18.2", + "17.5", "--xcode-build-version", "17a5305f", "--out-dir", @@ -5334,7 +4365,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "webrtc_nonparallel_tests iPhone 15 18.2", + "name": "webrtc_nonparallel_tests iPhone 14 17.5", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -5357,22 +4388,22 @@ "path": "Xcode.app" }, { - "name": "runtime_ios_18_2", - "path": "Runtime-ios-18.2" + "name": "runtime_ios_17_5", + "path": "Runtime-ios-17.5" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "webrtc_nonparallel_tests", "test_id_prefix": "ninja://:webrtc_nonparallel_tests/", - "variant_id": "iPhone 15 18.2" + "variant_id": "iPhone 14 17.5" }, { "args": [ "--platform", - "iPhone X", + "iPhone 15", "--version", - "16.4", + "18.2", "--xcode-build-version", "17a5305f", "--out-dir", @@ -5382,7 +4413,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "webrtc_nonparallel_tests iPhone X 16.4", + "name": "webrtc_nonparallel_tests iPhone 15 18.2", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -5405,15 +4436,15 @@ "path": "Xcode.app" }, { - "name": "runtime_ios_16_4", - "path": "Runtime-ios-16.4" + "name": "runtime_ios_18_2", + "path": "Runtime-ios-18.2" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "webrtc_nonparallel_tests", "test_id_prefix": "ninja://:webrtc_nonparallel_tests/", - "variant_id": "iPhone X 16.4" + "variant_id": "iPhone 15 18.2" } ] }, diff --git a/third_party/libwebrtc/infra/specs/variants.pyl b/third_party/libwebrtc/infra/specs/variants.pyl @@ -7,16 +7,6 @@ # be found in the AUTHORS file in the root of the source tree. { - 'SIM_IPHONE_X_16_4': { - 'args': [ - '--platform', - 'iPhone X', - '--version', - '16.4', - ], - 'identifier': 'iPhone X 16.4', - 'mixins': ['xcode_17_main', 'ios_runtime_cache_16_4'], - }, 'SIM_IPHONE_14_17_5': { 'args': [ '--platform',