Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Switch some mac_unopt tests from intel to arm hosts #55882

Merged
merged 6 commits into from
Oct 28, 2024
Merged

Switch some mac_unopt tests from intel to arm hosts #55882

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2f3601b
Switch some mac_unopt tests from intel to arm hosts
zanderso Oct 15, 2024
c3c3190
Add --quiet
zanderso Oct 15, 2024
612e8de
Update mac_unopt.json
zanderso Oct 15, 2024
56fc526
Update mac_unopt.json
zanderso Oct 15, 2024
0184c1d
Disable flutter_desktop_darwin_unittests on arm64
zanderso Oct 16, 2024
43d6d75
Update run_tests.py
zanderso Oct 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
124 changes: 39 additions & 85 deletions ci/builders/mac_unopt.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@
"drone_dimensions": [
"device_type=none",
"os=Mac-13|Mac-14",
"cpu=x86",
"mac_model=Macmini8,1"
"cpu=arm64"
],
"gclient_variables": {
"download_android_deps": false,
Expand All @@ -15,22 +14,23 @@
},
"gn": [
"--target-dir",
"ci/host_debug_tests",
"ci/host_debug_arm64_tests",
"--runtime-mode",
"debug",
"--mac-cpu",
"arm64",
"--no-lto",
"--prebuilt-dart-sdk",
"--build-embedder-examples",
"--use-glfw-swiftshader",
"--rbe",
"--no-goma",
"--xcode-symlinks"

],
"name": "ci/host_debug_tests",
"description": "Produces debug mode x64 macOS host-side tooling and builds host-side unit tests for x64 macOS.",
"name": "ci/host_debug_arm64_tests",
"description": "Produces debug mode arm64 macOS host-side tooling and builds host-side unit tests for arm64 macOS.",
"ninja": {
"config": "ci/host_debug_tests",
"config": "ci/host_debug_arm64_tests",
"targets": []
},
"properties": {
Expand All @@ -44,8 +44,9 @@
"name": "Host Tests for host_debug",
"script": "flutter/testing/run_tests.py",
"parameters": [
"--quiet",
"--variant",
"ci/host_debug_tests",
"ci/host_debug_arm64_tests",
"--type",
"dart,dart-host,engine",
"--engine-capture-core-dump"
Expand All @@ -58,29 +59,30 @@
"drone_dimensions": [
"device_type=none",
"os=Mac-13|Mac-14",
"cpu=x86",
"mac_model=Macmini8,1"
"cpu=arm64"
],
"gclient_variables": {
"download_android_deps": false,
"use_rbe": true
},
"gn": [
"--target-dir",
"ci/host_profile_tests",
"ci/host_profile_arm64_tests",
"--runtime-mode",
"profile",
"--mac-cpu",
"arm64",
"--no-lto",
"--prebuilt-dart-sdk",
"--build-embedder-examples",
"--rbe",
"--no-goma",
"--xcode-symlinks"
],
"name": "ci/host_profile_tests",
"description": "Produces profile mode x64 macOS host-side tooling and builds host-side unit tests for x64 macOS.",
"name": "ci/host_profile_arm64_tests",
"description": "Produces profile mode arm64 macOS host-side tooling and builds host-side unit tests for arm64 macOS.",
"ninja": {
"config": "ci/host_profile_tests",
"config": "ci/host_profile_arm64_tests",
"targets": []
},
"properties": {
Expand All @@ -94,8 +96,9 @@
"name": "Host Tests for host_profile",
"script": "flutter/testing/run_tests.py",
"parameters": [
"--quiet",
"--variant",
"ci/host_profile_tests",
"ci/host_profile_arm64_tests",
"--type",
"dart,dart-host,engine",
"--engine-capture-core-dump"
Expand All @@ -108,24 +111,19 @@
"drone_dimensions": [
"device_type=none",
"os=Mac-13|Mac-14",
"cpu=x86",
"mac_model=Macmini8,1"
],
"dependencies": [
{
"dependency": "goldctl",
"version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
}
"cpu=arm64"
],
"gclient_variables": {
"download_android_deps": false,
"use_rbe": true
},
"gn": [
"--target-dir",
"ci/host_release_tests",
"ci/host_release_arm64_tests",
"--runtime-mode",
"release",
"--mac-cpu",
"arm64",
"--no-lto",
"--prebuilt-dart-sdk",
"--build-embedder-examples",
Expand All @@ -134,10 +132,10 @@
"--no-goma",
"--xcode-symlinks"
],
"name": "ci/host_release_tests",
"description": "Produces release mode x64 macOS host-side tooling and builds host-side unit tests for x64 macOS.",
"name": "ci/host_release_arm64_tests",
"description": "Produces release mode arm64 macOS host-side tooling and builds host-side unit tests for arm64 macOS.",
"ninja": {
"config": "ci/host_release_tests",
"config": "ci/host_release_arm64_tests",
"targets": []
},
"properties": {
Expand All @@ -148,11 +146,12 @@
"tests": [
{
"language": "python3",
"name": "Impeller-golden, dart and engine tests for host_release",
"name": "Dart and engine tests for host_release",
"script": "flutter/testing/run_tests.py",
"parameters": [
"--quiet",
"--variant",
"ci/host_release_tests",
"ci/host_release_arm64_tests",
"--type",
"dart,dart-host,engine"
]
Expand Down Expand Up @@ -208,6 +207,7 @@
"name": "Impeller-golden for host_release",
"script": "flutter/testing/run_tests.py",
"parameters": [
"--quiet",
"--variant",
"ci/mac_release_arm64_tests",
"--type",
Expand All @@ -216,62 +216,6 @@
}
]
},
{
"cas_archive": false,
"drone_dimensions": [
"device_type=none",
"os=Mac-13|Mac-14",
"cpu=x86",
"mac_model=Macmini8,1"
],
"gclient_variables": {
"download_android_deps": false,
"use_rbe": true
},
"gn": [
"--target-dir",
"ci/host_debug_unopt",
"--runtime-mode",
"debug",
"--unoptimized",
"--no-lto",
"--prebuilt-dart-sdk",
"--enable-impeller-3d",
"--rbe",
"--no-goma",
"--xcode-symlinks"
],
"name": "ci/host_debug_unopt",
"description": "Builds a debug mode unopt x64 macOS engine and runs host-side tests.",
"ninja": {
"config": "ci/host_debug_unopt",
"targets": []
},
"properties": {
"$flutter/osx_sdk": {
"sdk_version": "15a240d"
}
},
"tests": [
{
"language": "python3",
"name": "Host Tests for host_debug_unopt",
"script": "flutter/testing/run_tests.py",
"parameters": [
"--variant",
"ci/host_debug_unopt",
"--type",
"dart,dart-host,engine",
"--engine-capture-core-dump"
]
},
{
"name": "Tests of tools/gn",
"language": "python3",
"script": "flutter/tools/gn_test.py"
}
]
},
{
"cas_archive": false,
"properties": {
Expand Down Expand Up @@ -318,6 +262,7 @@
"name": "Tests for ios_debug_unopt_sim",
"script": "flutter/testing/run_tests.py",
"parameters": [
"--quiet",
"--variant",
"ci/ios_debug_unopt_sim",
"--type",
Expand Down Expand Up @@ -358,6 +303,7 @@
"--prebuilt-dart-sdk",
"--mac-cpu",
"arm64",
"--enable-impeller-3d",
"--rbe",
"--no-goma",
"--xcode-symlinks",
Expand All @@ -381,13 +327,19 @@
"name": "Host Tests for host_debug_unopt_arm64",
"script": "flutter/testing/run_tests.py",
"parameters": [
"--quiet",
"--variant",
"ci/host_debug_unopt_arm64",
"--type",
"dart,dart-host,engine,impeller-golden",
"--engine-capture-core-dump",
"--no-skia-gold"
]
},
{
"name": "Tests of tools/gn",
"language": "python3",
"script": "flutter/tools/gn_test.py"
}
]
},
Expand Down Expand Up @@ -439,6 +391,7 @@
"name": "Tests for ios_debug_unopt_sim_arm64",
"script": "flutter/testing/run_tests.py",
"parameters": [
"--quiet",
"--variant",
"ci/ios_debug_unopt_sim_arm64",
"--type",
Expand Down Expand Up @@ -507,6 +460,7 @@
"name": "Tests for ios_debug_unopt_sim_arm64_extension_safe",
"script": "flutter/testing/run_tests.py",
"parameters": [
"--quiet",
"--variant",
"ci/ios_debug_unopt_sim_arm64_extension_safe",
"--type",
Expand Down