Skip to content

Commit

Permalink
Revert "Fix global tests doing nothing. (#45097)"
Browse files Browse the repository at this point in the history 
This reverts commit 52e8f5f.
  • Loading branch information
@zanderso
zanderso authored Aug 25, 2023
1 parent 873d626 commit ec7fa07
Show file tree
Hide file tree
Showing 4 changed files with 203 additions and 280 deletions.
18 changes: 12 additions & 6 deletions ci/builders/mac_android_aot_engine.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
],
"drone_dimensions": [
"device_type=none",
"os=Mac-12"
"os=Mac-12",
"cpu=x86"
],
"gclient_variables": {
"download_android_deps": false
Expand Down Expand Up @@ -52,7 +53,8 @@
],
"drone_dimensions": [
"device_type=none",
"os=Mac-12"
"os=Mac-12",
"cpu=x86"
],
"gclient_variables": {
"download_android_deps": false
Expand Down Expand Up @@ -91,7 +93,8 @@
],
"drone_dimensions": [
"device_type=none",
"os=Mac-12"
"os=Mac-12",
"cpu=x86"
],
"gclient_variables": {
"download_android_deps": false
Expand Down Expand Up @@ -130,7 +133,8 @@
],
"drone_dimensions": [
"device_type=none",
"os=Mac-12"
"os=Mac-12",
"cpu=x86"
],
"gclient_variables": {
"download_android_deps": false
Expand Down Expand Up @@ -168,7 +172,8 @@
],
"drone_dimensions": [
"device_type=none",
"os=Mac-12"
"os=Mac-12",
"cpu=x86"
],
"gclient_variables": {
"download_android_deps": false
Expand Down Expand Up @@ -207,7 +212,8 @@
],
"drone_dimensions": [
"device_type=none",
"os=Mac-12"
"os=Mac-12",
"cpu=x86"
],
"gclient_variables": {
"download_android_deps": false
Expand Down
162 changes: 59 additions & 103 deletions ci/builders/mac_host_engine.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@
],
"drone_dimensions": [
"device_type=none",
"os=Mac-12"
"os=Mac-12",
"cpu=x86",
"mac_model=Macmini8,1"
],
"gclient_variables": {
"download_android_deps": false
Expand Down Expand Up @@ -47,7 +49,21 @@
"$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 @@ -63,7 +79,9 @@
],
"drone_dimensions": [
"device_type=none",
"os=Mac-12"
"os=Mac-12",
"cpu=x86",
"mac_model=Macmini8,1"
],
"gclient_variables": {
"download_android_deps": false
Expand All @@ -90,7 +108,21 @@
"$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 @@ -107,7 +139,9 @@
],
"drone_dimensions": [
"device_type=none",
"os=Mac-12"
"os=Mac-12",
"cpu=x86",
"mac_model=Macmini8,1"
],
"dependencies": [
{
Expand Down Expand Up @@ -144,7 +178,20 @@
"$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 @@ -161,7 +208,8 @@
],
"drone_dimensions": [
"device_type=none",
"os=Mac-12"
"os=Mac-12",
"cpu=x86"
],
"gclient_variables": {
"download_android_deps": false
Expand Down Expand Up @@ -207,7 +255,8 @@
],
"drone_dimensions": [
"device_type=none",
"os=Mac-12"
"os=Mac-12",
"cpu=x86"
],
"gclient_variables": {
"download_android_deps": false
Expand Down Expand Up @@ -250,7 +299,8 @@
],
"drone_dimensions": [
"device_type=none",
"os=Mac-12"
"os=Mac-12",
"cpu=x86"
],
"gclient_variables": {
"download_android_deps": false
Expand Down Expand Up @@ -426,99 +476,5 @@
"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: 5 additions & 0 deletions ci/builders/mac_ios_engine.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
{
"drone_dimensions": [
"device_type=none",
"mac_model=Macmini8,1",
"os=Mac-12"
],
"gn": [
Expand All @@ -25,6 +26,7 @@
{
"drone_dimensions": [
"device_type=none",
"mac_model=Macmini8,1",
"os=Mac-12"
],
"gn": [
Expand All @@ -48,6 +50,7 @@
{
"drone_dimensions": [
"device_type=none",
"mac_model=Macmini8,1",
"os=Mac-12"
],
"gn": [
Expand All @@ -71,6 +74,7 @@
{
"drone_dimensions": [
"device_type=none",
"mac_model=Macmini8,1",
"os=Mac-12"
],
"gn": [
Expand All @@ -95,6 +99,7 @@
{
"drone_dimensions": [
"device_type=none",
"mac_model=Macmini8,1",
"os=Mac-12"
],
"gn": [
Expand Down
Loading

0 comments on commit ec7fa07

Please sign in to comment.