Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix global tests doing nothing. #45097

Merged
merged 4 commits into from
Aug 25, 2023
Merged

Fix global tests doing nothing. #45097

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2f4e988
Fix conflict generated by previous revert.
godofredoc Aug 25, 2023
0b5628a
Add xcode context to tests.
godofredoc Aug 25, 2023
dad479f
Use same arch for build and test in the sim tests.
godofredoc Aug 25, 2023
28107fd
Use x86 for ios_sim.
godofredoc Aug 25, 2023
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
18 changes: 6 additions & 12 deletions ci/builders/mac_android_aot_engine.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@
],
"drone_dimensions": [
"device_type=none",
"os=Mac-12",
"cpu=x86"
"os=Mac-12"
],
"gclient_variables": {
"download_android_deps": false
Expand Down Expand Up @@ -53,8 +52,7 @@
],
"drone_dimensions": [
"device_type=none",
"os=Mac-12",
"cpu=x86"
"os=Mac-12"
],
"gclient_variables": {
"download_android_deps": false
Expand Down Expand Up @@ -93,8 +91,7 @@
],
"drone_dimensions": [
"device_type=none",
"os=Mac-12",
"cpu=x86"
"os=Mac-12"
],
"gclient_variables": {
"download_android_deps": false
Expand Down Expand Up @@ -133,8 +130,7 @@
],
"drone_dimensions": [
"device_type=none",
"os=Mac-12",
"cpu=x86"
"os=Mac-12"
],
"gclient_variables": {
"download_android_deps": false
Expand Down Expand Up @@ -172,8 +168,7 @@
],
"drone_dimensions": [
"device_type=none",
"os=Mac-12",
"cpu=x86"
"os=Mac-12"
],
"gclient_variables": {
"download_android_deps": false
Expand Down Expand Up @@ -212,8 +207,7 @@
],
"drone_dimensions": [
"device_type=none",
"os=Mac-12",
"cpu=x86"
"os=Mac-12"
],
"gclient_variables": {
"download_android_deps": false
Expand Down
162 changes: 103 additions & 59 deletions ci/builders/mac_host_engine.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,7 @@
],
"drone_dimensions": [
"device_type=none",
"os=Mac-12",
"cpu=x86",
"mac_model=Macmini8,1"
"os=Mac-12"
],
"gclient_variables": {
"download_android_deps": false
Expand Down Expand Up @@ -49,21 +47,7 @@
"$flutter/osx_sdk": {
"sdk_version": "14e300c"
}
},
"tests": [
{
"language": "python3",
"name": "Host Tests for host_debug",
"parameters": [
"--variant",
"host_debug",
"--type",
"dart,engine",
"--engine-capture-core-dump"
],
"script": "flutter/testing/run_tests.py"
}
]
}
},
{
"archives": [
Expand All @@ -79,9 +63,7 @@
],
"drone_dimensions": [
"device_type=none",
"os=Mac-12",
"cpu=x86",
"mac_model=Macmini8,1"
"os=Mac-12"
],
"gclient_variables": {
"download_android_deps": false
Expand All @@ -108,21 +90,7 @@
"$flutter/osx_sdk": {
"sdk_version": "14e300c"
}
},
"tests": [
{
"language": "python3",
"name": "Host Tests for host_profile",
"parameters": [
"--variant",
"host_profile",
"--type",
"dart,engine",
"--engine-capture-core-dump"
],
"script": "flutter/testing/run_tests.py"
}
]
}
},
{
"archives": [
Expand All @@ -139,9 +107,7 @@
],
"drone_dimensions": [
"device_type=none",
"os=Mac-12",
"cpu=x86",
"mac_model=Macmini8,1"
"os=Mac-12"
],
"dependencies": [
{
Expand Down Expand Up @@ -178,20 +144,7 @@
"$flutter/osx_sdk": {
"sdk_version": "14e300c"
}
},
"tests": [
{
"language": "python3",
"name": "Impeller-golden, dart and engine tests for host_release",
"parameters": [
"--variant",
"host_release",
"--type",
"dart,engine,impeller-golden"
],
"script": "flutter/testing/run_tests.py"
}
]
}
},
{
"archives": [
Expand All @@ -208,8 +161,7 @@
],
"drone_dimensions": [
"device_type=none",
"os=Mac-12",
"cpu=x86"
"os=Mac-12"
],
"gclient_variables": {
"download_android_deps": false
Expand Down Expand Up @@ -255,8 +207,7 @@
],
"drone_dimensions": [
"device_type=none",
"os=Mac-12",
"cpu=x86"
"os=Mac-12"
],
"gclient_variables": {
"download_android_deps": false
Expand Down Expand Up @@ -299,8 +250,7 @@
],
"drone_dimensions": [
"device_type=none",
"os=Mac-12",
"cpu=x86"
"os=Mac-12"
],
"gclient_variables": {
"download_android_deps": false
Expand Down Expand Up @@ -476,5 +426,99 @@
"destination": "darwin-x64-release/gen_snapshot.zip",
"realm": "production"
}
],
"tests": [
{
"name": "Mac Host Tests for host_debug",
"recipe": "engine_v2/tester_engine",
"drone_dimensions": [
"device_type=none",
"os=Mac-12",
"cpu=x86"
],
"gclient_variables": {
"download_android_deps": false
},
"dependencies": [
"host_debug"
],
"tasks": [
{
"language": "python3",
"name": "Host Tests for host_debug",
"parameters": [
"--variant",
"host_debug",
"--type",
"dart,engine",
"--engine-capture-core-dump"
],
"script": "flutter/testing/run_tests.py"
}
]
},
{
"name": "Mac Impeller-golden, dart and engine tests for host_release",
"recipe": "engine_v2/tester_engine",
"drone_dimensions": [
"device_type=none",
"os=Mac-12",
"cpu=x86"
],
"gclient_variables": {
"download_android_deps": false
},
"dependencies": [
"host_release"
],
"test_dependencies": [
{
"dependency": "goldctl",
"version": "git_revision:3a77d0b12c697a840ca0c7705208e8622dc94603"
}
],
"tasks": [
{
"language": "python3",
"name": "Impeller-golden, dart and engine tests for host_release",
"parameters": [
"--variant",
"host_release",
"--type",
"dart,engine,impeller-golden"
],
"script": "flutter/testing/run_tests.py"
}
]
},
{
"name": "Mac Host Tests for host_profile",
"recipe": "engine_v2/tester_engine",
"drone_dimensions": [
"device_type=none",
"os=Mac-12",
"cpu=x86"
],
"gclient_variables": {
"download_android_deps": false
},
"dependencies": [
"host_profile"
],
"tasks": [
{
"language": "python3",
"name": "Host Tests for host_profile",
"parameters": [
"--variant",
"host_profile",
"--type",
"dart,engine",
"--engine-capture-core-dump"
],
"script": "flutter/testing/run_tests.py"
}
]
}
]
}
5 changes: 0 additions & 5 deletions ci/builders/mac_ios_engine.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
{
"drone_dimensions": [
"device_type=none",
"mac_model=Macmini8,1",
"os=Mac-12"
],
"gn": [
Expand All @@ -26,7 +25,6 @@
{
"drone_dimensions": [
"device_type=none",
"mac_model=Macmini8,1",
"os=Mac-12"
],
"gn": [
Expand All @@ -50,7 +48,6 @@
{
"drone_dimensions": [
"device_type=none",
"mac_model=Macmini8,1",
"os=Mac-12"
],
"gn": [
Expand All @@ -74,7 +71,6 @@
{
"drone_dimensions": [
"device_type=none",
"mac_model=Macmini8,1",
"os=Mac-12"
],
"gn": [
Expand All @@ -99,7 +95,6 @@
{
"drone_dimensions": [
"device_type=none",
"mac_model=Macmini8,1",
"os=Mac-12"
],
"gn": [
Expand Down
Loading