From 042973f624ac8b8c279db759a84aee6d8aa765cc Mon Sep 17 00:00:00 2001 From: Jeremy Leconte Date: Mon, 13 May 2024 08:45:26 +0200 Subject: [PATCH] Regenerate infra/specs json files. * ios_runtime_cache_15_5 has been removed from Chromium config, adding it back in mixins_webrtc.pyl. * The order of the arguments in the json file has been changed. * Seems using 'remove_mixins' is now required to get the same behavior as before. Change-Id: Ia252aaa6458f8c9caed5ead3b641bb85cd1917e8 Bug: None Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/350362 Commit-Queue: Jeremy Leconte Reviewed-by: Christoffer Dewerin Cr-Commit-Position: refs/heads/main@{#42279} --- infra/specs/client.webrtc.json | 378 ++++++++++++------------ infra/specs/client.webrtc.perf.json | 28 +- infra/specs/internal.client.webrtc.json | 4 +- infra/specs/mixins_webrtc.pyl | 8 + infra/specs/test_suites.pyl | 3 + infra/specs/tryserver.webrtc.json | 378 ++++++++++++------------ 6 files changed, 405 insertions(+), 394 deletions(-) diff --git a/infra/specs/client.webrtc.json b/infra/specs/client.webrtc.json index 9822358da2..4eacdeb112 100644 --- a/infra/specs/client.webrtc.json +++ b/infra/specs/client.webrtc.json @@ -7958,12 +7958,12 @@ "iPhone 14", "--version", "17.4", - "--out-dir", - "${ISOLATED_OUTDIR}", - "--xctest", "--xcodebuild-sim-runner", "--xcode-build-version", - "15c500b" + "15c500b", + "--out-dir", + "${ISOLATED_OUTDIR}", + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -8007,12 +8007,12 @@ "iPhone X", "--version", "15.5", - "--out-dir", - "${ISOLATED_OUTDIR}", - "--xctest", "--xcodebuild-sim-runner", "--xcode-build-version", - "15c500b" + "15c500b", + "--out-dir", + "${ISOLATED_OUTDIR}", + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -8056,12 +8056,12 @@ "iPhone X", "--version", "16.4", - "--out-dir", - "${ISOLATED_OUTDIR}", - "--xctest", "--xcodebuild-sim-runner", "--xcode-build-version", - "15c500b" + "15c500b", + "--out-dir", + "${ISOLATED_OUTDIR}", + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -8105,11 +8105,11 @@ "iPhone 14", "--version", "17.4", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -8153,11 +8153,11 @@ "iPhone X", "--version", "15.5", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -8201,11 +8201,11 @@ "iPhone X", "--version", "16.4", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -8249,11 +8249,11 @@ "iPhone 14", "--version", "17.4", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -8297,11 +8297,11 @@ "iPhone X", "--version", "15.5", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -8345,11 +8345,11 @@ "iPhone X", "--version", "16.4", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -8393,11 +8393,11 @@ "iPhone 14", "--version", "17.4", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -8441,11 +8441,11 @@ "iPhone X", "--version", "15.5", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -8489,11 +8489,11 @@ "iPhone X", "--version", "16.4", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -8537,11 +8537,11 @@ "iPhone 14", "--version", "17.4", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -8585,11 +8585,11 @@ "iPhone X", "--version", "15.5", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -8633,11 +8633,11 @@ "iPhone X", "--version", "16.4", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -8681,11 +8681,11 @@ "iPhone 14", "--version", "17.4", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -8730,11 +8730,11 @@ "iPhone X", "--version", "15.5", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -8779,11 +8779,11 @@ "iPhone X", "--version", "16.4", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -8828,11 +8828,11 @@ "iPhone 14", "--version", "17.4", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -8878,11 +8878,11 @@ "iPhone X", "--version", "15.5", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -8928,11 +8928,11 @@ "iPhone X", "--version", "16.4", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -8978,11 +8978,11 @@ "iPhone 14", "--version", "17.4", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -9026,11 +9026,11 @@ "iPhone X", "--version", "15.5", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -9074,11 +9074,11 @@ "iPhone X", "--version", "16.4", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -9122,11 +9122,11 @@ "iPhone 14", "--version", "17.4", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -9170,11 +9170,11 @@ "iPhone X", "--version", "15.5", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -9218,11 +9218,11 @@ "iPhone X", "--version", "16.4", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -9266,11 +9266,11 @@ "iPhone 14", "--version", "17.4", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -9314,11 +9314,11 @@ "iPhone X", "--version", "15.5", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -9362,11 +9362,11 @@ "iPhone X", "--version", "16.4", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -9410,11 +9410,11 @@ "iPhone 14", "--version", "17.4", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -9459,11 +9459,11 @@ "iPhone X", "--version", "15.5", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -9508,11 +9508,11 @@ "iPhone X", "--version", "16.4", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -9557,12 +9557,12 @@ "iPhone 14", "--version", "17.4", - "--out-dir", - "${ISOLATED_OUTDIR}", - "--xctest", "--xcodebuild-sim-runner", "--xcode-build-version", - "15c500b" + "15c500b", + "--out-dir", + "${ISOLATED_OUTDIR}", + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -9606,12 +9606,12 @@ "iPhone X", "--version", "15.5", - "--out-dir", - "${ISOLATED_OUTDIR}", - "--xctest", "--xcodebuild-sim-runner", "--xcode-build-version", - "15c500b" + "15c500b", + "--out-dir", + "${ISOLATED_OUTDIR}", + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -9655,12 +9655,12 @@ "iPhone X", "--version", "16.4", - "--out-dir", - "${ISOLATED_OUTDIR}", - "--xctest", "--xcodebuild-sim-runner", "--xcode-build-version", - "15c500b" + "15c500b", + "--out-dir", + "${ISOLATED_OUTDIR}", + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -9704,12 +9704,12 @@ "iPhone 14", "--version", "17.4", - "--out-dir", - "${ISOLATED_OUTDIR}", - "--xctest", "--xcodebuild-sim-runner", "--xcode-build-version", - "15c500b" + "15c500b", + "--out-dir", + "${ISOLATED_OUTDIR}", + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -9753,12 +9753,12 @@ "iPhone X", "--version", "15.5", - "--out-dir", - "${ISOLATED_OUTDIR}", - "--xctest", "--xcodebuild-sim-runner", "--xcode-build-version", - "15c500b" + "15c500b", + "--out-dir", + "${ISOLATED_OUTDIR}", + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -9802,12 +9802,12 @@ "iPhone X", "--version", "16.4", - "--out-dir", - "${ISOLATED_OUTDIR}", - "--xctest", "--xcodebuild-sim-runner", "--xcode-build-version", - "15c500b" + "15c500b", + "--out-dir", + "${ISOLATED_OUTDIR}", + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -9851,11 +9851,11 @@ "iPhone 14", "--version", "17.4", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -9901,11 +9901,11 @@ "iPhone X", "--version", "15.5", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -9951,11 +9951,11 @@ "iPhone X", "--version", "16.4", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -10001,11 +10001,11 @@ "iPhone 14", "--version", "17.4", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -10049,11 +10049,11 @@ "iPhone X", "--version", "15.5", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -10097,11 +10097,11 @@ "iPhone X", "--version", "16.4", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -10145,11 +10145,11 @@ "iPhone 14", "--version", "17.4", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -10193,11 +10193,11 @@ "iPhone X", "--version", "15.5", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -10241,11 +10241,11 @@ "iPhone X", "--version", "16.4", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -10289,11 +10289,11 @@ "iPhone 14", "--version", "17.4", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -10337,11 +10337,11 @@ "iPhone X", "--version", "15.5", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -10385,11 +10385,11 @@ "iPhone X", "--version", "16.4", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -10433,11 +10433,11 @@ "iPhone 14", "--version", "17.4", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -10482,11 +10482,11 @@ "iPhone X", "--version", "15.5", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -10531,11 +10531,11 @@ "iPhone X", "--version", "16.4", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -10580,11 +10580,11 @@ "iPhone 14", "--version", "17.4", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -10628,11 +10628,11 @@ "iPhone X", "--version", "15.5", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -10676,11 +10676,11 @@ "iPhone X", "--version", "16.4", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -10724,11 +10724,11 @@ "iPhone 14", "--version", "17.4", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -10772,11 +10772,11 @@ "iPhone X", "--version", "15.5", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -10820,11 +10820,11 @@ "iPhone X", "--version", "16.4", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" diff --git a/infra/specs/client.webrtc.perf.json b/infra/specs/client.webrtc.perf.json index e2caa998c7..6015ac0407 100644 --- a/infra/specs/client.webrtc.perf.json +++ b/infra/specs/client.webrtc.perf.json @@ -38,8 +38,8 @@ }, { "args": [ - "--isolated-script-test-perf-output=${ISOLATED_OUTDIR}/perftest-output.pb", - "--nologs" + "--nologs", + "--isolated-script-test-perf-output=${ISOLATED_OUTDIR}/perftest-output.pb" ], "merge": { "args": [ @@ -109,8 +109,8 @@ }, { "args": [ - "--isolated-script-test-perf-output=${ISOLATED_OUTDIR}/perftest-output.pb", - "--nologs" + "--nologs", + "--isolated-script-test-perf-output=${ISOLATED_OUTDIR}/perftest-output.pb" ], "merge": { "args": [ @@ -182,12 +182,12 @@ }, { "args": [ + "--nologs", "--gtest_output=json:${ISOLATED_OUTDIR}/gtest_output.json", "--test-launcher-summary-output=${ISOLATED_OUTDIR}/gtest_output.json", "--test-arg=--gtest_output=json:/custom_artifacts/gtest_output.json", "--test-arg=--undefok=test_launcher_summary_output", - "--isolated-script-test-perf-output=${ISOLATED_OUTDIR}/perftest-output.pb", - "--nologs" + "--isolated-script-test-perf-output=${ISOLATED_OUTDIR}/perftest-output.pb" ], "merge": { "args": [ @@ -254,8 +254,8 @@ "args": [ "--test_artifacts_dir=${ISOLATED_OUTDIR}", "--save_worst_frame", - "--gtest_output=json:${ISOLATED_OUTDIR}/gtest_output.json", - "--nologs" + "--nologs", + "--gtest_output=json:${ISOLATED_OUTDIR}/gtest_output.json" ], "merge": { "args": [ @@ -322,8 +322,8 @@ "args": [ "--test_artifacts_dir=${ISOLATED_OUTDIR}", "--save_worst_frame", - "--gtest_output=json:${ISOLATED_OUTDIR}/gtest_output.json", - "--nologs" + "--nologs", + "--gtest_output=json:${ISOLATED_OUTDIR}/gtest_output.json" ], "merge": { "args": [ @@ -391,8 +391,8 @@ "args": [ "--test_artifacts_dir=${ISOLATED_OUTDIR}", "--save_worst_frame", - "--gtest_output=json:${ISOLATED_OUTDIR}/gtest_output.json", - "--nologs" + "--nologs", + "--gtest_output=json:${ISOLATED_OUTDIR}/gtest_output.json" ], "merge": { "args": [ @@ -459,8 +459,8 @@ "args": [ "--test_artifacts_dir=${ISOLATED_OUTDIR}", "--save_worst_frame", - "--gtest_output=json:${ISOLATED_OUTDIR}/gtest_output.json", - "--nologs" + "--nologs", + "--gtest_output=json:${ISOLATED_OUTDIR}/gtest_output.json" ], "merge": { "args": [ diff --git a/infra/specs/internal.client.webrtc.json b/infra/specs/internal.client.webrtc.json index 95d0caa8b2..7ccfd50df4 100644 --- a/infra/specs/internal.client.webrtc.json +++ b/infra/specs/internal.client.webrtc.json @@ -415,13 +415,13 @@ "isolated_scripts": [ { "args": [ + "--nologs", "--write_perf_output_on_ios", "--xctest", "--xcode-build-version", "14c18", "--out-dir", - "${ISOLATED_OUTDIR}", - "--nologs" + "${ISOLATED_OUTDIR}" ], "merge": { "args": [ diff --git a/infra/specs/mixins_webrtc.pyl b/infra/specs/mixins_webrtc.pyl index 6ef5b41ffa..b9a6404e26 100644 --- a/infra/specs/mixins_webrtc.pyl +++ b/infra/specs/mixins_webrtc.pyl @@ -58,6 +58,14 @@ }, }, }, + 'ios_runtime_cache_15_5': { + 'swarming': { + 'named_caches': [{ + 'name': 'runtime_ios_15_5', + 'path': 'Runtime-ios-15.5' + }] + } + }, 'limited-capacity': { # Sometimes there are multiple tests that can be run only on one machine. # We need to increase timeouts so the tests dont expire before the machine is freed. diff --git a/infra/specs/test_suites.pyl b/infra/specs/test_suites.pyl index 0226a646ea..49b3bc9347 100644 --- a/infra/specs/test_suites.pyl +++ b/infra/specs/test_suites.pyl @@ -42,6 +42,7 @@ }, 'slow_peer_connection_unittests': {}, 'svc_tests': { + 'remove_mixins': ['walleye'], 'mixins': ['shards-8', 'crosshatch'], }, 'system_wrappers_unittests': {}, @@ -99,9 +100,11 @@ }, 'desktop_tests_try_server_specific': { 'video_codec_perf_tests': { + 'remove_mixins': ['resultdb-json-format'], 'mixins': ['quick-perf-tests', 'resultdb-gtest-json-format'], }, 'webrtc_perf_tests': { + 'remove_mixins': ['resultdb-json-format'], 'mixins': ['quick-perf-tests', 'resultdb-gtest-json-format'], } }, diff --git a/infra/specs/tryserver.webrtc.json b/infra/specs/tryserver.webrtc.json index 5391a84da8..98cd16b11e 100644 --- a/infra/specs/tryserver.webrtc.json +++ b/infra/specs/tryserver.webrtc.json @@ -2320,12 +2320,12 @@ "iPhone 14", "--version", "17.4", - "--out-dir", - "${ISOLATED_OUTDIR}", - "--xctest", "--xcodebuild-sim-runner", "--xcode-build-version", - "15c500b" + "15c500b", + "--out-dir", + "${ISOLATED_OUTDIR}", + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -2369,12 +2369,12 @@ "iPhone X", "--version", "15.5", - "--out-dir", - "${ISOLATED_OUTDIR}", - "--xctest", "--xcodebuild-sim-runner", "--xcode-build-version", - "15c500b" + "15c500b", + "--out-dir", + "${ISOLATED_OUTDIR}", + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -2418,12 +2418,12 @@ "iPhone X", "--version", "16.4", - "--out-dir", - "${ISOLATED_OUTDIR}", - "--xctest", "--xcodebuild-sim-runner", "--xcode-build-version", - "15c500b" + "15c500b", + "--out-dir", + "${ISOLATED_OUTDIR}", + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -2467,11 +2467,11 @@ "iPhone 14", "--version", "17.4", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -2515,11 +2515,11 @@ "iPhone X", "--version", "15.5", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -2563,11 +2563,11 @@ "iPhone X", "--version", "16.4", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -2611,11 +2611,11 @@ "iPhone 14", "--version", "17.4", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -2659,11 +2659,11 @@ "iPhone X", "--version", "15.5", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -2707,11 +2707,11 @@ "iPhone X", "--version", "16.4", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -2755,11 +2755,11 @@ "iPhone 14", "--version", "17.4", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -2803,11 +2803,11 @@ "iPhone X", "--version", "15.5", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -2851,11 +2851,11 @@ "iPhone X", "--version", "16.4", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -2899,11 +2899,11 @@ "iPhone 14", "--version", "17.4", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -2947,11 +2947,11 @@ "iPhone X", "--version", "15.5", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -2995,11 +2995,11 @@ "iPhone X", "--version", "16.4", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -3043,11 +3043,11 @@ "iPhone 14", "--version", "17.4", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -3092,11 +3092,11 @@ "iPhone X", "--version", "15.5", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -3141,11 +3141,11 @@ "iPhone X", "--version", "16.4", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -3190,11 +3190,11 @@ "iPhone 14", "--version", "17.4", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -3240,11 +3240,11 @@ "iPhone X", "--version", "15.5", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -3290,11 +3290,11 @@ "iPhone X", "--version", "16.4", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -3340,11 +3340,11 @@ "iPhone 14", "--version", "17.4", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -3388,11 +3388,11 @@ "iPhone X", "--version", "15.5", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -3436,11 +3436,11 @@ "iPhone X", "--version", "16.4", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -3484,11 +3484,11 @@ "iPhone 14", "--version", "17.4", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -3532,11 +3532,11 @@ "iPhone X", "--version", "15.5", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -3580,11 +3580,11 @@ "iPhone X", "--version", "16.4", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -3628,11 +3628,11 @@ "iPhone 14", "--version", "17.4", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -3676,11 +3676,11 @@ "iPhone X", "--version", "15.5", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -3724,11 +3724,11 @@ "iPhone X", "--version", "16.4", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -3772,11 +3772,11 @@ "iPhone 14", "--version", "17.4", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -3821,11 +3821,11 @@ "iPhone X", "--version", "15.5", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -3870,11 +3870,11 @@ "iPhone X", "--version", "16.4", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -3919,12 +3919,12 @@ "iPhone 14", "--version", "17.4", - "--out-dir", - "${ISOLATED_OUTDIR}", - "--xctest", "--xcodebuild-sim-runner", "--xcode-build-version", - "15c500b" + "15c500b", + "--out-dir", + "${ISOLATED_OUTDIR}", + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -3968,12 +3968,12 @@ "iPhone X", "--version", "15.5", - "--out-dir", - "${ISOLATED_OUTDIR}", - "--xctest", "--xcodebuild-sim-runner", "--xcode-build-version", - "15c500b" + "15c500b", + "--out-dir", + "${ISOLATED_OUTDIR}", + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -4017,12 +4017,12 @@ "iPhone X", "--version", "16.4", - "--out-dir", - "${ISOLATED_OUTDIR}", - "--xctest", "--xcodebuild-sim-runner", "--xcode-build-version", - "15c500b" + "15c500b", + "--out-dir", + "${ISOLATED_OUTDIR}", + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -4066,12 +4066,12 @@ "iPhone 14", "--version", "17.4", - "--out-dir", - "${ISOLATED_OUTDIR}", - "--xctest", "--xcodebuild-sim-runner", "--xcode-build-version", - "15c500b" + "15c500b", + "--out-dir", + "${ISOLATED_OUTDIR}", + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -4115,12 +4115,12 @@ "iPhone X", "--version", "15.5", - "--out-dir", - "${ISOLATED_OUTDIR}", - "--xctest", "--xcodebuild-sim-runner", "--xcode-build-version", - "15c500b" + "15c500b", + "--out-dir", + "${ISOLATED_OUTDIR}", + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -4164,12 +4164,12 @@ "iPhone X", "--version", "16.4", - "--out-dir", - "${ISOLATED_OUTDIR}", - "--xctest", "--xcodebuild-sim-runner", "--xcode-build-version", - "15c500b" + "15c500b", + "--out-dir", + "${ISOLATED_OUTDIR}", + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -4213,11 +4213,11 @@ "iPhone 14", "--version", "17.4", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -4263,11 +4263,11 @@ "iPhone X", "--version", "15.5", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -4313,11 +4313,11 @@ "iPhone X", "--version", "16.4", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -4363,11 +4363,11 @@ "iPhone 14", "--version", "17.4", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -4411,11 +4411,11 @@ "iPhone X", "--version", "15.5", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -4459,11 +4459,11 @@ "iPhone X", "--version", "16.4", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -4507,11 +4507,11 @@ "iPhone 14", "--version", "17.4", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -4555,11 +4555,11 @@ "iPhone X", "--version", "15.5", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -4603,11 +4603,11 @@ "iPhone X", "--version", "16.4", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -4651,11 +4651,11 @@ "iPhone 14", "--version", "17.4", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -4699,11 +4699,11 @@ "iPhone X", "--version", "15.5", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -4747,11 +4747,11 @@ "iPhone X", "--version", "16.4", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -4795,11 +4795,11 @@ "iPhone 14", "--version", "17.4", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -4844,11 +4844,11 @@ "iPhone X", "--version", "15.5", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -4893,11 +4893,11 @@ "iPhone X", "--version", "16.4", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -4942,11 +4942,11 @@ "iPhone 14", "--version", "17.4", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -4990,11 +4990,11 @@ "iPhone X", "--version", "15.5", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -5038,11 +5038,11 @@ "iPhone X", "--version", "16.4", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -5086,11 +5086,11 @@ "iPhone 14", "--version", "17.4", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -5134,11 +5134,11 @@ "iPhone X", "--version", "15.5", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" @@ -5182,11 +5182,11 @@ "iPhone X", "--version", "16.4", + "--xcode-build-version", + "15c500b", "--out-dir", "${ISOLATED_OUTDIR}", - "--xctest", - "--xcode-build-version", - "15c500b" + "--xctest" ], "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py"