Skip to content

Commit

Permalink
Fix global tests doing nothing. (flutter#45097)
Browse files Browse the repository at this point in the history 
This was related to using tests property which is expected for tests running within a build and tasks property used for global tests.

Bug: flutter/flutter#133301

[C++, Objective-C, Java style guides]: https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style
  • Loading branch information
@godofredoc @gaaclarke
godofredoc authored and gaaclarke committed Aug 30, 2023
1 parent ed66cdc commit 161cf98
Show file tree
Hide file tree
Showing 4 changed files with 280 additions and 203 deletions.
18 changes: 6 additions & 12 deletions ci/builders/mac_android_aot_engine.json
View file
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
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
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

0 comments on commit 161cf98

Please sign in to comment.