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

Commit 52e8f5f

Browse files
godofredocgodofredoc
authored
Fix global tests doing nothing. (#45097)
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
1 parent cb58abd commit 52e8f5f

File tree

4 files changed

+280
-203
lines changed

4 files changed

+280
-203
lines changed

‎ci/builders/mac_android_aot_engine.json‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@
1414
],
1515
"drone_dimensions": [
1616
"device_type=none",
17-
"os=Mac-12",
18-
"cpu=x86"
17+
"os=Mac-12"
1918
],
2019
"gclient_variables": {
2120
"download_android_deps": false
@@ -53,8 +52,7 @@
5352
],
5453
"drone_dimensions": [
5554
"device_type=none",
56-
"os=Mac-12",
57-
"cpu=x86"
55+
"os=Mac-12"
5856
],
5957
"gclient_variables": {
6058
"download_android_deps": false
@@ -93,8 +91,7 @@
9391
],
9492
"drone_dimensions": [
9593
"device_type=none",
96-
"os=Mac-12",
97-
"cpu=x86"
94+
"os=Mac-12"
9895
],
9996
"gclient_variables": {
10097
"download_android_deps": false
@@ -133,8 +130,7 @@
133130
],
134131
"drone_dimensions": [
135132
"device_type=none",
136-
"os=Mac-12",
137-
"cpu=x86"
133+
"os=Mac-12"
138134
],
139135
"gclient_variables": {
140136
"download_android_deps": false
@@ -172,8 +168,7 @@
172168
],
173169
"drone_dimensions": [
174170
"device_type=none",
175-
"os=Mac-12",
176-
"cpu=x86"
171+
"os=Mac-12"
177172
],
178173
"gclient_variables": {
179174
"download_android_deps": false
@@ -212,8 +207,7 @@
212207
],
213208
"drone_dimensions": [
214209
"device_type=none",
215-
"os=Mac-12",
216-
"cpu=x86"
210+
"os=Mac-12"
217211
],
218212
"gclient_variables": {
219213
"download_android_deps": false

‎ci/builders/mac_host_engine.json‎

Lines changed: 103 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,7 @@
1515
],
1616
"drone_dimensions": [
1717
"device_type=none",
18-
"os=Mac-12",
19-
"cpu=x86",
20-
"mac_model=Macmini8,1"
18+
"os=Mac-12"
2119
],
2220
"gclient_variables": {
2321
"download_android_deps": false
@@ -49,21 +47,7 @@
4947
"$flutter/osx_sdk": {
5048
"sdk_version": "14e300c"
5149
}
52-
},
53-
"tests": [
54-
{
55-
"language": "python3",
56-
"name": "Host Tests for host_debug",
57-
"parameters": [
58-
"--variant",
59-
"host_debug",
60-
"--type",
61-
"dart,engine",
62-
"--engine-capture-core-dump"
63-
],
64-
"script": "flutter/testing/run_tests.py"
65-
}
66-
]
50+
}
6751
},
6852
{
6953
"archives": [
@@ -79,9 +63,7 @@
7963
],
8064
"drone_dimensions": [
8165
"device_type=none",
82-
"os=Mac-12",
83-
"cpu=x86",
84-
"mac_model=Macmini8,1"
66+
"os=Mac-12"
8567
],
8668
"gclient_variables": {
8769
"download_android_deps": false
@@ -108,21 +90,7 @@
10890
"$flutter/osx_sdk": {
10991
"sdk_version": "14e300c"
11092
}
111-
},
112-
"tests": [
113-
{
114-
"language": "python3",
115-
"name": "Host Tests for host_profile",
116-
"parameters": [
117-
"--variant",
118-
"host_profile",
119-
"--type",
120-
"dart,engine",
121-
"--engine-capture-core-dump"
122-
],
123-
"script": "flutter/testing/run_tests.py"
124-
}
125-
]
93+
}
12694
},
12795
{
12896
"archives": [
@@ -139,9 +107,7 @@
139107
],
140108
"drone_dimensions": [
141109
"device_type=none",
142-
"os=Mac-12",
143-
"cpu=x86",
144-
"mac_model=Macmini8,1"
110+
"os=Mac-12"
145111
],
146112
"dependencies": [
147113
{
@@ -178,20 +144,7 @@
178144
"$flutter/osx_sdk": {
179145
"sdk_version": "14e300c"
180146
}
181-
},
182-
"tests": [
183-
{
184-
"language": "python3",
185-
"name": "Impeller-golden, dart and engine tests for host_release",
186-
"parameters": [
187-
"--variant",
188-
"host_release",
189-
"--type",
190-
"dart,engine,impeller-golden"
191-
],
192-
"script": "flutter/testing/run_tests.py"
193-
}
194-
]
147+
}
195148
},
196149
{
197150
"archives": [
@@ -208,8 +161,7 @@
208161
],
209162
"drone_dimensions": [
210163
"device_type=none",
211-
"os=Mac-12",
212-
"cpu=x86"
164+
"os=Mac-12"
213165
],
214166
"gclient_variables": {
215167
"download_android_deps": false
@@ -255,8 +207,7 @@
255207
],
256208
"drone_dimensions": [
257209
"device_type=none",
258-
"os=Mac-12",
259-
"cpu=x86"
210+
"os=Mac-12"
260211
],
261212
"gclient_variables": {
262213
"download_android_deps": false
@@ -299,8 +250,7 @@
299250
],
300251
"drone_dimensions": [
301252
"device_type=none",
302-
"os=Mac-12",
303-
"cpu=x86"
253+
"os=Mac-12"
304254
],
305255
"gclient_variables": {
306256
"download_android_deps": false
@@ -476,5 +426,99 @@
476426
"destination": "darwin-x64-release/gen_snapshot.zip",
477427
"realm": "production"
478428
}
429+
],
430+
"tests": [
431+
{
432+
"name": "Mac Host Tests for host_debug",
433+
"recipe": "engine_v2/tester_engine",
434+
"drone_dimensions": [
435+
"device_type=none",
436+
"os=Mac-12",
437+
"cpu=x86"
438+
],
439+
"gclient_variables": {
440+
"download_android_deps": false
441+
},
442+
"dependencies": [
443+
"host_debug"
444+
],
445+
"tasks": [
446+
{
447+
"language": "python3",
448+
"name": "Host Tests for host_debug",
449+
"parameters": [
450+
"--variant",
451+
"host_debug",
452+
"--type",
453+
"dart,engine",
454+
"--engine-capture-core-dump"
455+
],
456+
"script": "flutter/testing/run_tests.py"
457+
}
458+
]
459+
},
460+
{
461+
"name": "Mac Impeller-golden, dart and engine tests for host_release",
462+
"recipe": "engine_v2/tester_engine",
463+
"drone_dimensions": [
464+
"device_type=none",
465+
"os=Mac-12",
466+
"cpu=x86"
467+
],
468+
"gclient_variables": {
469+
"download_android_deps": false
470+
},
471+
"dependencies": [
472+
"host_release"
473+
],
474+
"test_dependencies": [
475+
{
476+
"dependency": "goldctl",
477+
"version": "git_revision:3a77d0b12c697a840ca0c7705208e8622dc94603"
478+
}
479+
],
480+
"tasks": [
481+
{
482+
"language": "python3",
483+
"name": "Impeller-golden, dart and engine tests for host_release",
484+
"parameters": [
485+
"--variant",
486+
"host_release",
487+
"--type",
488+
"dart,engine,impeller-golden"
489+
],
490+
"script": "flutter/testing/run_tests.py"
491+
}
492+
]
493+
},
494+
{
495+
"name": "Mac Host Tests for host_profile",
496+
"recipe": "engine_v2/tester_engine",
497+
"drone_dimensions": [
498+
"device_type=none",
499+
"os=Mac-12",
500+
"cpu=x86"
501+
],
502+
"gclient_variables": {
503+
"download_android_deps": false
504+
},
505+
"dependencies": [
506+
"host_profile"
507+
],
508+
"tasks": [
509+
{
510+
"language": "python3",
511+
"name": "Host Tests for host_profile",
512+
"parameters": [
513+
"--variant",
514+
"host_profile",
515+
"--type",
516+
"dart,engine",
517+
"--engine-capture-core-dump"
518+
],
519+
"script": "flutter/testing/run_tests.py"
520+
}
521+
]
522+
}
479523
]
480524
}

‎ci/builders/mac_ios_engine.json‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
{
44
"drone_dimensions": [
55
"device_type=none",
6-
"mac_model=Macmini8,1",
76
"os=Mac-12"
87
],
98
"gn": [
@@ -26,7 +25,6 @@
2625
{
2726
"drone_dimensions": [
2827
"device_type=none",
29-
"mac_model=Macmini8,1",
3028
"os=Mac-12"
3129
],
3230
"gn": [
@@ -50,7 +48,6 @@
5048
{
5149
"drone_dimensions": [
5250
"device_type=none",
53-
"mac_model=Macmini8,1",
5451
"os=Mac-12"
5552
],
5653
"gn": [
@@ -74,7 +71,6 @@
7471
{
7572
"drone_dimensions": [
7673
"device_type=none",
77-
"mac_model=Macmini8,1",
7874
"os=Mac-12"
7975
],
8076
"gn": [
@@ -99,7 +95,6 @@
9995
{
10096
"drone_dimensions": [
10197
"device_type=none",
102-
"mac_model=Macmini8,1",
10398
"os=Mac-12"
10499
],
105100
"gn": [

0 commit comments

Comments
 (0)