From 72efd91d1f696e2b4c2ea38aae95e15e77aa49a9 Mon Sep 17 00:00:00 2001 From: Jeremy Leconte Date: Thu, 28 Apr 2022 09:45:29 +0200 Subject: [PATCH] Re-enable XCTests apprtcmobile_tests on simulators. Bug: webrtc:12244 Change-Id: Idca6bcc1505b0b9ceadfafbe128d64d53800f34a Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/260280 Commit-Queue: Jeremy Leconte Reviewed-by: Christoffer Jansson Cr-Commit-Position: refs/heads/main@{#36684} --- infra/specs/client.webrtc.json | 150 ++++++++++++++++++++++++++++++ infra/specs/test_suites.pyl | 6 +- infra/specs/tryserver.webrtc.json | 150 ++++++++++++++++++++++++++++++ 3 files changed, 303 insertions(+), 3 deletions(-) diff --git a/infra/specs/client.webrtc.json b/infra/specs/client.webrtc.json index db3ec27e88..9d6c17ae91 100644 --- a/infra/specs/client.webrtc.json +++ b/infra/specs/client.webrtc.json @@ -8482,6 +8482,56 @@ "iOS64 Release": {}, "iOS64 Sim Debug (iOS 12)": { "isolated_scripts": [ + { + "args": [ + "--platform", + "iPhone X", + "--version", + "12.4", + "--xcode-build-version", + "12a7209", + "--out-dir", + "${ISOLATED_OUTDIR}", + "--xcode-parallelization" + ], + "isolate_name": "apprtcmobile_tests", + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, + "name": "apprtcmobile_tests", + "resultdb": { + "enable": true, + "has_native_resultdb_integration": true + }, + "swarming": { + "can_use_on_swarming_builders": true, + "cipd_packages": [ + { + "cipd_package": "infra/tools/mac_toolchain/${platform}", + "location": ".", + "revision": "git_revision:723fc1a6c8cdf2631a57851f5610e598db0c1de1" + } + ], + "dimension_sets": [ + { + "os": "Mac-11" + } + ], + "named_caches": [ + { + "name": "runtime_ios_12_4", + "path": "Runtime-ios-12.4" + }, + { + "name": "xcode_ios_12a7209", + "path": "Xcode.app" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test_id_prefix": "ninja://examples:apprtcmobile_tests/" + }, { "args": [ "--platform", @@ -9369,6 +9419,56 @@ }, "iOS64 Sim Debug (iOS 13)": { "isolated_scripts": [ + { + "args": [ + "--platform", + "iPhone X", + "--version", + "13.6", + "--xcode-build-version", + "12a7209", + "--out-dir", + "${ISOLATED_OUTDIR}", + "--xcode-parallelization" + ], + "isolate_name": "apprtcmobile_tests", + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, + "name": "apprtcmobile_tests", + "resultdb": { + "enable": true, + "has_native_resultdb_integration": true + }, + "swarming": { + "can_use_on_swarming_builders": true, + "cipd_packages": [ + { + "cipd_package": "infra/tools/mac_toolchain/${platform}", + "location": ".", + "revision": "git_revision:723fc1a6c8cdf2631a57851f5610e598db0c1de1" + } + ], + "dimension_sets": [ + { + "os": "Mac-11" + } + ], + "named_caches": [ + { + "name": "runtime_ios_13_6", + "path": "Runtime-ios-13.6" + }, + { + "name": "xcode_ios_12a7209", + "path": "Xcode.app" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test_id_prefix": "ninja://examples:apprtcmobile_tests/" + }, { "args": [ "--platform", @@ -10256,6 +10356,56 @@ }, "iOS64 Sim Debug (iOS 14.0)": { "isolated_scripts": [ + { + "args": [ + "--platform", + "iPhone X", + "--version", + "14.0", + "--xcode-build-version", + "12a7209", + "--out-dir", + "${ISOLATED_OUTDIR}", + "--xcode-parallelization" + ], + "isolate_name": "apprtcmobile_tests", + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, + "name": "apprtcmobile_tests", + "resultdb": { + "enable": true, + "has_native_resultdb_integration": true + }, + "swarming": { + "can_use_on_swarming_builders": true, + "cipd_packages": [ + { + "cipd_package": "infra/tools/mac_toolchain/${platform}", + "location": ".", + "revision": "git_revision:723fc1a6c8cdf2631a57851f5610e598db0c1de1" + } + ], + "dimension_sets": [ + { + "os": "Mac-11" + } + ], + "named_caches": [ + { + "name": "runtime_ios_14_0", + "path": "Runtime-ios-14.0" + }, + { + "name": "xcode_ios_12a7209", + "path": "Xcode.app" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test_id_prefix": "ninja://examples:apprtcmobile_tests/" + }, { "args": [ "--platform", diff --git a/infra/specs/test_suites.pyl b/infra/specs/test_suites.pyl index 703a8a112a..c5de39d19a 100644 --- a/infra/specs/test_suites.pyl +++ b/infra/specs/test_suites.pyl @@ -159,9 +159,9 @@ }, }, 'ios_simulator_tests': { - # TODO(bugs.webrtc.org/12244): Some tests are skipped on iOS simulator - # platforms because they fail or they are flaky. - #'apprtcmobile_tests': {'mixins': ['xcode_parallelization']}, + 'apprtcmobile_tests': { + 'mixins': ['xcode_parallelization'] + }, 'audio_decoder_unittests': {}, 'common_audio_unittests': {}, 'common_video_unittests': {}, diff --git a/infra/specs/tryserver.webrtc.json b/infra/specs/tryserver.webrtc.json index 2fbe29d1fc..a5d32559ef 100644 --- a/infra/specs/tryserver.webrtc.json +++ b/infra/specs/tryserver.webrtc.json @@ -2588,6 +2588,56 @@ "ios_compile_arm64_rel": {}, "ios_sim_x64_dbg_ios12": { "isolated_scripts": [ + { + "args": [ + "--platform", + "iPhone X", + "--version", + "12.4", + "--xcode-build-version", + "12a7209", + "--out-dir", + "${ISOLATED_OUTDIR}", + "--xcode-parallelization" + ], + "isolate_name": "apprtcmobile_tests", + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, + "name": "apprtcmobile_tests", + "resultdb": { + "enable": true, + "has_native_resultdb_integration": true + }, + "swarming": { + "can_use_on_swarming_builders": true, + "cipd_packages": [ + { + "cipd_package": "infra/tools/mac_toolchain/${platform}", + "location": ".", + "revision": "git_revision:723fc1a6c8cdf2631a57851f5610e598db0c1de1" + } + ], + "dimension_sets": [ + { + "os": "Mac-11" + } + ], + "named_caches": [ + { + "name": "runtime_ios_12_4", + "path": "Runtime-ios-12.4" + }, + { + "name": "xcode_ios_12a7209", + "path": "Xcode.app" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test_id_prefix": "ninja://examples:apprtcmobile_tests/" + }, { "args": [ "--platform", @@ -3475,6 +3525,56 @@ }, "ios_sim_x64_dbg_ios13": { "isolated_scripts": [ + { + "args": [ + "--platform", + "iPhone X", + "--version", + "13.6", + "--xcode-build-version", + "12a7209", + "--out-dir", + "${ISOLATED_OUTDIR}", + "--xcode-parallelization" + ], + "isolate_name": "apprtcmobile_tests", + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, + "name": "apprtcmobile_tests", + "resultdb": { + "enable": true, + "has_native_resultdb_integration": true + }, + "swarming": { + "can_use_on_swarming_builders": true, + "cipd_packages": [ + { + "cipd_package": "infra/tools/mac_toolchain/${platform}", + "location": ".", + "revision": "git_revision:723fc1a6c8cdf2631a57851f5610e598db0c1de1" + } + ], + "dimension_sets": [ + { + "os": "Mac-11" + } + ], + "named_caches": [ + { + "name": "runtime_ios_13_6", + "path": "Runtime-ios-13.6" + }, + { + "name": "xcode_ios_12a7209", + "path": "Xcode.app" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test_id_prefix": "ninja://examples:apprtcmobile_tests/" + }, { "args": [ "--platform", @@ -4362,6 +4462,56 @@ }, "ios_sim_x64_dbg_ios14": { "isolated_scripts": [ + { + "args": [ + "--platform", + "iPhone X", + "--version", + "14.0", + "--xcode-build-version", + "12a7209", + "--out-dir", + "${ISOLATED_OUTDIR}", + "--xcode-parallelization" + ], + "isolate_name": "apprtcmobile_tests", + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, + "name": "apprtcmobile_tests", + "resultdb": { + "enable": true, + "has_native_resultdb_integration": true + }, + "swarming": { + "can_use_on_swarming_builders": true, + "cipd_packages": [ + { + "cipd_package": "infra/tools/mac_toolchain/${platform}", + "location": ".", + "revision": "git_revision:723fc1a6c8cdf2631a57851f5610e598db0c1de1" + } + ], + "dimension_sets": [ + { + "os": "Mac-11" + } + ], + "named_caches": [ + { + "name": "runtime_ios_14_0", + "path": "Runtime-ios-14.0" + }, + { + "name": "xcode_ios_12a7209", + "path": "Xcode.app" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test_id_prefix": "ninja://examples:apprtcmobile_tests/" + }, { "args": [ "--platform",