Re-enable XCTests sdk_unittests on simulators.
Bug: webrtc:12244
Change-Id: Id5cd44e93cd0221e09380d05da510b05c22e143f
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/259773
Reviewed-by: Christoffer Jansson <jansson@webrtc.org>
Commit-Queue: Jeremy Leconte <jleconte@google.com>
Cr-Commit-Position: refs/heads/main@{#36699}
diff --git a/infra/specs/client.webrtc.json b/infra/specs/client.webrtc.json
index 9d6c17a..ff24b95 100644
--- a/infra/specs/client.webrtc.json
+++ b/infra/specs/client.webrtc.json
@@ -9081,6 +9081,56 @@
"--xcode-build-version",
"12a7209",
"--out-dir",
+ "${ISOLATED_OUTDIR}",
+ "--xcode-parallelization"
+ ],
+ "isolate_name": "sdk_unittests",
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+ },
+ "name": "sdk_unittests",
+ "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://sdk:sdk_unittests/"
+ },
+ {
+ "args": [
+ "--platform",
+ "iPhone X",
+ "--version",
+ "12.4",
+ "--xcode-build-version",
+ "12a7209",
+ "--out-dir",
"${ISOLATED_OUTDIR}"
],
"isolate_name": "system_wrappers_unittests",
@@ -10018,6 +10068,56 @@
"--xcode-build-version",
"12a7209",
"--out-dir",
+ "${ISOLATED_OUTDIR}",
+ "--xcode-parallelization"
+ ],
+ "isolate_name": "sdk_unittests",
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+ },
+ "name": "sdk_unittests",
+ "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://sdk:sdk_unittests/"
+ },
+ {
+ "args": [
+ "--platform",
+ "iPhone X",
+ "--version",
+ "13.6",
+ "--xcode-build-version",
+ "12a7209",
+ "--out-dir",
"${ISOLATED_OUTDIR}"
],
"isolate_name": "system_wrappers_unittests",
@@ -10955,6 +11055,56 @@
"--xcode-build-version",
"12a7209",
"--out-dir",
+ "${ISOLATED_OUTDIR}",
+ "--xcode-parallelization"
+ ],
+ "isolate_name": "sdk_unittests",
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+ },
+ "name": "sdk_unittests",
+ "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://sdk:sdk_unittests/"
+ },
+ {
+ "args": [
+ "--platform",
+ "iPhone X",
+ "--version",
+ "14.0",
+ "--xcode-build-version",
+ "12a7209",
+ "--out-dir",
"${ISOLATED_OUTDIR}"
],
"isolate_name": "system_wrappers_unittests",
diff --git a/infra/specs/test_suites.pyl b/infra/specs/test_suites.pyl
index c5de39d..ce153f6 100644
--- a/infra/specs/test_suites.pyl
+++ b/infra/specs/test_suites.pyl
@@ -175,9 +175,9 @@
'sdk_framework_unittests': {
'mixins': ['xcode_parallelization']
},
- # TODO(bugs.webrtc.org/12244): Some tests are skipped on iOS simulator
- # platforms because they fail or they are flaky.
- #'sdk_unittests': {'mixins': ['xcode_parallelization']},
+ 'sdk_unittests': {
+ 'mixins': ['xcode_parallelization']
+ },
'system_wrappers_unittests': {},
'test_support_unittests': {},
'tools_unittests': {},
diff --git a/infra/specs/tryserver.webrtc.json b/infra/specs/tryserver.webrtc.json
index a5d3255..3f6acfa 100644
--- a/infra/specs/tryserver.webrtc.json
+++ b/infra/specs/tryserver.webrtc.json
@@ -3187,6 +3187,56 @@
"--xcode-build-version",
"12a7209",
"--out-dir",
+ "${ISOLATED_OUTDIR}",
+ "--xcode-parallelization"
+ ],
+ "isolate_name": "sdk_unittests",
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+ },
+ "name": "sdk_unittests",
+ "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://sdk:sdk_unittests/"
+ },
+ {
+ "args": [
+ "--platform",
+ "iPhone X",
+ "--version",
+ "12.4",
+ "--xcode-build-version",
+ "12a7209",
+ "--out-dir",
"${ISOLATED_OUTDIR}"
],
"isolate_name": "system_wrappers_unittests",
@@ -4124,6 +4174,56 @@
"--xcode-build-version",
"12a7209",
"--out-dir",
+ "${ISOLATED_OUTDIR}",
+ "--xcode-parallelization"
+ ],
+ "isolate_name": "sdk_unittests",
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+ },
+ "name": "sdk_unittests",
+ "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://sdk:sdk_unittests/"
+ },
+ {
+ "args": [
+ "--platform",
+ "iPhone X",
+ "--version",
+ "13.6",
+ "--xcode-build-version",
+ "12a7209",
+ "--out-dir",
"${ISOLATED_OUTDIR}"
],
"isolate_name": "system_wrappers_unittests",
@@ -5061,6 +5161,56 @@
"--xcode-build-version",
"12a7209",
"--out-dir",
+ "${ISOLATED_OUTDIR}",
+ "--xcode-parallelization"
+ ],
+ "isolate_name": "sdk_unittests",
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+ },
+ "name": "sdk_unittests",
+ "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://sdk:sdk_unittests/"
+ },
+ {
+ "args": [
+ "--platform",
+ "iPhone X",
+ "--version",
+ "14.0",
+ "--xcode-build-version",
+ "12a7209",
+ "--out-dir",
"${ISOLATED_OUTDIR}"
],
"isolate_name": "system_wrappers_unittests",
