Switch some mac_unopt tests from intel to arm hosts (flutter/engine#55882)

This commit is contained in:
Zachary Anderson 2024-10-28 11:06:55 -07:00 committed by GitHub
parent be07b4555d
commit e09a2da889

View File

@ -5,8 +5,7 @@
"drone_dimensions": [ "drone_dimensions": [
"device_type=none", "device_type=none",
"os=Mac-13|Mac-14", "os=Mac-13|Mac-14",
"cpu=x86", "cpu=arm64"
"mac_model=Macmini8,1"
], ],
"gclient_variables": { "gclient_variables": {
"download_android_deps": false, "download_android_deps": false,
@ -15,9 +14,11 @@
}, },
"gn": [ "gn": [
"--target-dir", "--target-dir",
"ci/host_debug_tests", "ci/host_debug_arm64_tests",
"--runtime-mode", "--runtime-mode",
"debug", "debug",
"--mac-cpu",
"arm64",
"--no-lto", "--no-lto",
"--prebuilt-dart-sdk", "--prebuilt-dart-sdk",
"--build-embedder-examples", "--build-embedder-examples",
@ -25,12 +26,11 @@
"--rbe", "--rbe",
"--no-goma", "--no-goma",
"--xcode-symlinks" "--xcode-symlinks"
], ],
"name": "ci/host_debug_tests", "name": "ci/host_debug_arm64_tests",
"description": "Produces debug mode x64 macOS host-side tooling and builds host-side unit tests for x64 macOS.", "description": "Produces debug mode arm64 macOS host-side tooling and builds host-side unit tests for arm64 macOS.",
"ninja": { "ninja": {
"config": "ci/host_debug_tests", "config": "ci/host_debug_arm64_tests",
"targets": [] "targets": []
}, },
"properties": { "properties": {
@ -44,8 +44,9 @@
"name": "Host Tests for host_debug", "name": "Host Tests for host_debug",
"script": "flutter/testing/run_tests.py", "script": "flutter/testing/run_tests.py",
"parameters": [ "parameters": [
"--quiet",
"--variant", "--variant",
"ci/host_debug_tests", "ci/host_debug_arm64_tests",
"--type", "--type",
"dart,dart-host,engine", "dart,dart-host,engine",
"--engine-capture-core-dump" "--engine-capture-core-dump"
@ -58,8 +59,7 @@
"drone_dimensions": [ "drone_dimensions": [
"device_type=none", "device_type=none",
"os=Mac-13|Mac-14", "os=Mac-13|Mac-14",
"cpu=x86", "cpu=arm64"
"mac_model=Macmini8,1"
], ],
"gclient_variables": { "gclient_variables": {
"download_android_deps": false, "download_android_deps": false,
@ -67,9 +67,11 @@
}, },
"gn": [ "gn": [
"--target-dir", "--target-dir",
"ci/host_profile_tests", "ci/host_profile_arm64_tests",
"--runtime-mode", "--runtime-mode",
"profile", "profile",
"--mac-cpu",
"arm64",
"--no-lto", "--no-lto",
"--prebuilt-dart-sdk", "--prebuilt-dart-sdk",
"--build-embedder-examples", "--build-embedder-examples",
@ -77,10 +79,10 @@
"--no-goma", "--no-goma",
"--xcode-symlinks" "--xcode-symlinks"
], ],
"name": "ci/host_profile_tests", "name": "ci/host_profile_arm64_tests",
"description": "Produces profile mode x64 macOS host-side tooling and builds host-side unit tests for x64 macOS.", "description": "Produces profile mode arm64 macOS host-side tooling and builds host-side unit tests for arm64 macOS.",
"ninja": { "ninja": {
"config": "ci/host_profile_tests", "config": "ci/host_profile_arm64_tests",
"targets": [] "targets": []
}, },
"properties": { "properties": {
@ -94,8 +96,9 @@
"name": "Host Tests for host_profile", "name": "Host Tests for host_profile",
"script": "flutter/testing/run_tests.py", "script": "flutter/testing/run_tests.py",
"parameters": [ "parameters": [
"--quiet",
"--variant", "--variant",
"ci/host_profile_tests", "ci/host_profile_arm64_tests",
"--type", "--type",
"dart,dart-host,engine", "dart,dart-host,engine",
"--engine-capture-core-dump" "--engine-capture-core-dump"
@ -108,14 +111,7 @@
"drone_dimensions": [ "drone_dimensions": [
"device_type=none", "device_type=none",
"os=Mac-13|Mac-14", "os=Mac-13|Mac-14",
"cpu=x86", "cpu=arm64"
"mac_model=Macmini8,1"
],
"dependencies": [
{
"dependency": "goldctl",
"version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
}
], ],
"gclient_variables": { "gclient_variables": {
"download_android_deps": false, "download_android_deps": false,
@ -123,9 +119,11 @@
}, },
"gn": [ "gn": [
"--target-dir", "--target-dir",
"ci/host_release_tests", "ci/host_release_arm64_tests",
"--runtime-mode", "--runtime-mode",
"release", "release",
"--mac-cpu",
"arm64",
"--no-lto", "--no-lto",
"--prebuilt-dart-sdk", "--prebuilt-dart-sdk",
"--build-embedder-examples", "--build-embedder-examples",
@ -134,10 +132,10 @@
"--no-goma", "--no-goma",
"--xcode-symlinks" "--xcode-symlinks"
], ],
"name": "ci/host_release_tests", "name": "ci/host_release_arm64_tests",
"description": "Produces release mode x64 macOS host-side tooling and builds host-side unit tests for x64 macOS.", "description": "Produces release mode arm64 macOS host-side tooling and builds host-side unit tests for arm64 macOS.",
"ninja": { "ninja": {
"config": "ci/host_release_tests", "config": "ci/host_release_arm64_tests",
"targets": [] "targets": []
}, },
"properties": { "properties": {
@ -148,11 +146,12 @@
"tests": [ "tests": [
{ {
"language": "python3", "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", "script": "flutter/testing/run_tests.py",
"parameters": [ "parameters": [
"--quiet",
"--variant", "--variant",
"ci/host_release_tests", "ci/host_release_arm64_tests",
"--type", "--type",
"dart,dart-host,engine" "dart,dart-host,engine"
] ]
@ -208,6 +207,7 @@
"name": "Impeller-golden for host_release", "name": "Impeller-golden for host_release",
"script": "flutter/testing/run_tests.py", "script": "flutter/testing/run_tests.py",
"parameters": [ "parameters": [
"--quiet",
"--variant", "--variant",
"ci/mac_release_arm64_tests", "ci/mac_release_arm64_tests",
"--type", "--type",
@ -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, "cas_archive": false,
"properties": { "properties": {
@ -318,6 +262,7 @@
"name": "Tests for ios_debug_unopt_sim", "name": "Tests for ios_debug_unopt_sim",
"script": "flutter/testing/run_tests.py", "script": "flutter/testing/run_tests.py",
"parameters": [ "parameters": [
"--quiet",
"--variant", "--variant",
"ci/ios_debug_unopt_sim", "ci/ios_debug_unopt_sim",
"--type", "--type",
@ -358,6 +303,7 @@
"--prebuilt-dart-sdk", "--prebuilt-dart-sdk",
"--mac-cpu", "--mac-cpu",
"arm64", "arm64",
"--enable-impeller-3d",
"--rbe", "--rbe",
"--no-goma", "--no-goma",
"--xcode-symlinks", "--xcode-symlinks",
@ -381,6 +327,7 @@
"name": "Host Tests for host_debug_unopt_arm64", "name": "Host Tests for host_debug_unopt_arm64",
"script": "flutter/testing/run_tests.py", "script": "flutter/testing/run_tests.py",
"parameters": [ "parameters": [
"--quiet",
"--variant", "--variant",
"ci/host_debug_unopt_arm64", "ci/host_debug_unopt_arm64",
"--type", "--type",
@ -388,6 +335,11 @@
"--engine-capture-core-dump", "--engine-capture-core-dump",
"--no-skia-gold" "--no-skia-gold"
] ]
},
{
"name": "Tests of tools/gn",
"language": "python3",
"script": "flutter/tools/gn_test.py"
} }
] ]
}, },
@ -439,6 +391,7 @@
"name": "Tests for ios_debug_unopt_sim_arm64", "name": "Tests for ios_debug_unopt_sim_arm64",
"script": "flutter/testing/run_tests.py", "script": "flutter/testing/run_tests.py",
"parameters": [ "parameters": [
"--quiet",
"--variant", "--variant",
"ci/ios_debug_unopt_sim_arm64", "ci/ios_debug_unopt_sim_arm64",
"--type", "--type",
@ -507,6 +460,7 @@
"name": "Tests for ios_debug_unopt_sim_arm64_extension_safe", "name": "Tests for ios_debug_unopt_sim_arm64_extension_safe",
"script": "flutter/testing/run_tests.py", "script": "flutter/testing/run_tests.py",
"parameters": [ "parameters": [
"--quiet",
"--variant", "--variant",
"ci/ios_debug_unopt_sim_arm64_extension_safe", "ci/ios_debug_unopt_sim_arm64_extension_safe",
"--type", "--type",