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

Commit f41fb98

Browse files
zandersozanderso
authored
Revert "Fix global tests doing nothing." (#45125)
Reverts #45097 Many failures on CI like: ``` ld: warning: ignoring file ../../../../out/ios_debug_sim_arm64_extension_safe/libocmock_shared.dylib, building for iOS Simulator-x86_64 but attempting to link with file built for iOS Simulator-arm64 ld: warning: ignoring file ../../../../out/ios_debug_sim_arm64_extension_safe/libios_test_flutter.dylib, building for iOS Simulator-x86_64 but attempting to link with file built for iOS Simulator-arm64 ``` https://ci.chromium.org/ui/p/flutter/builders/prod/Mac%20Production%20Engine%20Drone/131188/overview Not sure if there are also other tests failing in different ways.
1 parent 873d626 commit f41fb98

File tree

4 files changed

+203
-280
lines changed

4 files changed

+203
-280
lines changed

‎ci/builders/mac_android_aot_engine.json‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
],
1515
"drone_dimensions": [
1616
"device_type=none",
17-
"os=Mac-12"
17+
"os=Mac-12",
18+
"cpu=x86"
1819
],
1920
"gclient_variables": {
2021
"download_android_deps": false
@@ -52,7 +53,8 @@
5253
],
5354
"drone_dimensions": [
5455
"device_type=none",
55-
"os=Mac-12"
56+
"os=Mac-12",
57+
"cpu=x86"
5658
],
5759
"gclient_variables": {
5860
"download_android_deps": false
@@ -91,7 +93,8 @@
9193
],
9294
"drone_dimensions": [
9395
"device_type=none",
94-
"os=Mac-12"
96+
"os=Mac-12",
97+
"cpu=x86"
9598
],
9699
"gclient_variables": {
97100
"download_android_deps": false
@@ -130,7 +133,8 @@
130133
],
131134
"drone_dimensions": [
132135
"device_type=none",
133-
"os=Mac-12"
136+
"os=Mac-12",
137+
"cpu=x86"
134138
],
135139
"gclient_variables": {
136140
"download_android_deps": false
@@ -168,7 +172,8 @@
168172
],
169173
"drone_dimensions": [
170174
"device_type=none",
171-
"os=Mac-12"
175+
"os=Mac-12",
176+
"cpu=x86"
172177
],
173178
"gclient_variables": {
174179
"download_android_deps": false
@@ -207,7 +212,8 @@
207212
],
208213
"drone_dimensions": [
209214
"device_type=none",
210-
"os=Mac-12"
215+
"os=Mac-12",
216+
"cpu=x86"
211217
],
212218
"gclient_variables": {
213219
"download_android_deps": false

‎ci/builders/mac_host_engine.json‎

Lines changed: 59 additions & 103 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@
1515
],
1616
"drone_dimensions": [
1717
"device_type=none",
18-
"os=Mac-12"
18+
"os=Mac-12",
19+
"cpu=x86",
20+
"mac_model=Macmini8,1"
1921
],
2022
"gclient_variables": {
2123
"download_android_deps": false
@@ -47,7 +49,21 @@
4749
"$flutter/osx_sdk": {
4850
"sdk_version": "14e300c"
4951
}
50-
}
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+
]
5167
},
5268
{
5369
"archives": [
@@ -63,7 +79,9 @@
6379
],
6480
"drone_dimensions": [
6581
"device_type=none",
66-
"os=Mac-12"
82+
"os=Mac-12",
83+
"cpu=x86",
84+
"mac_model=Macmini8,1"
6785
],
6886
"gclient_variables": {
6987
"download_android_deps": false
@@ -90,7 +108,21 @@
90108
"$flutter/osx_sdk": {
91109
"sdk_version": "14e300c"
92110
}
93-
}
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+
]
94126
},
95127
{
96128
"archives": [
@@ -107,7 +139,9 @@
107139
],
108140
"drone_dimensions": [
109141
"device_type=none",
110-
"os=Mac-12"
142+
"os=Mac-12",
143+
"cpu=x86",
144+
"mac_model=Macmini8,1"
111145
],
112146
"dependencies": [
113147
{
@@ -144,7 +178,20 @@
144178
"$flutter/osx_sdk": {
145179
"sdk_version": "14e300c"
146180
}
147-
}
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+
]
148195
},
149196
{
150197
"archives": [
@@ -161,7 +208,8 @@
161208
],
162209
"drone_dimensions": [
163210
"device_type=none",
164-
"os=Mac-12"
211+
"os=Mac-12",
212+
"cpu=x86"
165213
],
166214
"gclient_variables": {
167215
"download_android_deps": false
@@ -207,7 +255,8 @@
207255
],
208256
"drone_dimensions": [
209257
"device_type=none",
210-
"os=Mac-12"
258+
"os=Mac-12",
259+
"cpu=x86"
211260
],
212261
"gclient_variables": {
213262
"download_android_deps": false
@@ -250,7 +299,8 @@
250299
],
251300
"drone_dimensions": [
252301
"device_type=none",
253-
"os=Mac-12"
302+
"os=Mac-12",
303+
"cpu=x86"
254304
],
255305
"gclient_variables": {
256306
"download_android_deps": false
@@ -426,99 +476,5 @@
426476
"destination": "darwin-x64-release/gen_snapshot.zip",
427477
"realm": "production"
428478
}
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-
}
523479
]
524480
}

‎ci/builders/mac_ios_engine.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
{
44
"drone_dimensions": [
55
"device_type=none",
6+
"mac_model=Macmini8,1",
67
"os=Mac-12"
78
],
89
"gn": [
@@ -25,6 +26,7 @@
2526
{
2627
"drone_dimensions": [
2728
"device_type=none",
29+
"mac_model=Macmini8,1",
2830
"os=Mac-12"
2931
],
3032
"gn": [
@@ -48,6 +50,7 @@
4850
{
4951
"drone_dimensions": [
5052
"device_type=none",
53+
"mac_model=Macmini8,1",
5154
"os=Mac-12"
5255
],
5356
"gn": [
@@ -71,6 +74,7 @@
7174
{
7275
"drone_dimensions": [
7376
"device_type=none",
77+
"mac_model=Macmini8,1",
7478
"os=Mac-12"
7579
],
7680
"gn": [
@@ -95,6 +99,7 @@
9599
{
96100
"drone_dimensions": [
97101
"device_type=none",
102+
"mac_model=Macmini8,1",
98103
"os=Mac-12"
99104
],
100105
"gn": [

0 commit comments

Comments
 (0)