Skip to content

Commit ee120a2

Browse files
nglevinluispadron
nglevin
authored and
luispadron
committed
Rounding out testing support for dsymutil generated dSYMs in rules_apple starlark tests.
PiperOrigin-RevId: 752690208
1 parent b9b3bab commit ee120a2

17 files changed

+454
-0
lines changed

‎test/starlark_tests/apple_xcframework_tests.bzl‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ load(
2424
)
2525
load(
2626
"//test/starlark_tests/rules:analysis_output_group_info_files_test.bzl",
27+
"analysis_output_group_info_dsymutil_bundle_files_test",
2728
"analysis_output_group_info_files_test",
2829
)
2930
load(
@@ -343,6 +344,16 @@ def apple_xcframework_test_suite(name):
343344
],
344345
tags = [name],
345346
)
347+
analysis_output_group_info_dsymutil_bundle_files_test(
348+
name = "{}_dsyms_output_group_dsymutil_bundle_files_test".format(name),
349+
target_under_test = "//test/starlark_tests/targets_under_test/apple:ios_dynamic_xcframework",
350+
output_group_name = "dsyms",
351+
expected_outputs = [
352+
"ios_arm64_device/ios_dynamic_xcframework.dSYM",
353+
"ios_x86_64_simulator/ios_dynamic_xcframework.dSYM",
354+
],
355+
tags = [name],
356+
)
346357
analysis_output_group_info_files_test(
347358
name = "{}_fat_frameworks_dsyms_output_group_files_test".format(name),
348359
target_under_test = "//test/starlark_tests/targets_under_test/apple:ios_dynamic_lipoed_xcframework",
@@ -355,6 +366,16 @@ def apple_xcframework_test_suite(name):
355366
],
356367
tags = [name],
357368
)
369+
analysis_output_group_info_dsymutil_bundle_files_test(
370+
name = "{}_fat_frameworks_dsyms_output_group_dsymutil_bundle_files_test".format(name),
371+
target_under_test = "//test/starlark_tests/targets_under_test/apple:ios_dynamic_lipoed_xcframework",
372+
output_group_name = "dsyms",
373+
expected_outputs = [
374+
"ios_dynamic_lipoed_xcframework_ios_device.framework.dSYM",
375+
"ios_dynamic_lipoed_xcframework_ios_simulator.framework.dSYM",
376+
],
377+
tags = [name],
378+
)
358379

359380
linkmap_test(
360381
name = "{}_device_linkmap_test".format(name),

‎test/starlark_tests/ios_app_clip_tests.bzl‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,12 @@
1616

1717
load(
1818
"//test/starlark_tests/rules:analysis_output_group_info_files_test.bzl",
19+
"analysis_output_group_info_dsymutil_bundle_files_test",
1920
"analysis_output_group_info_files_test",
2021
)
2122
load(
2223
"//test/starlark_tests/rules:apple_dsym_bundle_info_test.bzl",
24+
"apple_dsym_bundle_info_dsymutil_bundle_test",
2325
"apple_dsym_bundle_info_test",
2426
)
2527
load(
@@ -195,6 +197,18 @@ def ios_app_clip_test_suite(name):
195197
],
196198
tags = [name],
197199
)
200+
analysis_output_group_info_dsymutil_bundle_files_test(
201+
name = "{}_with_runtime_framework_transitive_dsyms_output_group_info_dsymutil_bundle_test".format(name),
202+
target_under_test = "//test/starlark_tests/targets_under_test/ios:app_clip_with_fmwks_from_objc_swift_libraries_using_data",
203+
output_group_name = "dsyms",
204+
expected_outputs = [
205+
"app_clip_with_fmwks_from_objc_swift_libraries_using_data.app.dSYM",
206+
"fmwk_min_os_baseline_with_bundle.framework.dSYM",
207+
"fmwk_no_version.framework.dSYM",
208+
"fmwk_with_resources.framework.dSYM",
209+
],
210+
tags = [name],
211+
)
198212
analysis_output_group_info_files_test(
199213
name = "{}_with_runtime_framework_transitive_linkmaps_output_group_info_test".format(name),
200214
target_under_test = "//test/starlark_tests/targets_under_test/ios:app_clip_with_fmwks_from_objc_swift_libraries_using_data",
@@ -227,6 +241,20 @@ def ios_app_clip_test_suite(name):
227241
],
228242
tags = [name],
229243
)
244+
apple_dsym_bundle_info_dsymutil_bundle_test(
245+
name = "{}_with_runtime_framework_dsym_bundle_info_dsymutil_bundle_test".format(name),
246+
target_under_test = "//test/starlark_tests/targets_under_test/ios:app_clip_with_fmwks_from_objc_swift_libraries_using_data",
247+
expected_direct_dsyms = [
248+
"app_clip_with_fmwks_from_objc_swift_libraries_using_data.app.dSYM",
249+
],
250+
expected_transitive_dsyms = [
251+
"app_clip_with_fmwks_from_objc_swift_libraries_using_data.app.dSYM",
252+
"fmwk_min_os_baseline_with_bundle.framework.dSYM",
253+
"fmwk_no_version.framework.dSYM",
254+
"fmwk_with_resources.framework.dSYM",
255+
],
256+
tags = [name],
257+
)
230258

231259
# Tests inclusion of extensions.
232260
archive_contents_test(

‎test/starlark_tests/ios_extension_tests.bzl‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,12 @@
1616

1717
load(
1818
"//test/starlark_tests/rules:analysis_output_group_info_files_test.bzl",
19+
"analysis_output_group_info_dsymutil_bundle_files_test",
1920
"analysis_output_group_info_files_test",
2021
)
2122
load(
2223
"//test/starlark_tests/rules:apple_dsym_bundle_info_test.bzl",
24+
"apple_dsym_bundle_info_dsymutil_bundle_test",
2325
"apple_dsym_bundle_info_test",
2426
)
2527
load(
@@ -101,13 +103,30 @@ def ios_extension_test_suite(name):
101103
],
102104
tags = [name],
103105
)
106+
analysis_output_group_info_dsymutil_bundle_files_test(
107+
name = "{}_dsyms_output_group_dsymutil_bundle_files_test".format(name),
108+
target_under_test = "//test/starlark_tests/targets_under_test/ios:ext",
109+
output_group_name = "dsyms",
110+
expected_outputs = [
111+
"ext.appex.dSYM",
112+
],
113+
tags = [name],
114+
)
115+
104116
apple_dsym_bundle_info_test(
105117
name = "{}_dsym_bundle_info_files_test".format(name),
106118
target_under_test = "//test/starlark_tests/targets_under_test/ios:ext",
107119
expected_direct_dsyms = ["dSYMs/ext.appex.dSYM"],
108120
expected_transitive_dsyms = ["dSYMs/ext.appex.dSYM"],
109121
tags = [name],
110122
)
123+
apple_dsym_bundle_info_dsymutil_bundle_test(
124+
name = "{}_dsym_bundle_info_dsymutil_bundle_files_test".format(name),
125+
target_under_test = "//test/starlark_tests/targets_under_test/ios:ext",
126+
expected_direct_dsyms = ["ext.appex.dSYM"],
127+
expected_transitive_dsyms = ["ext.appex.dSYM"],
128+
tags = [name],
129+
)
111130

112131
infoplist_contents_test(
113132
name = "{}_plist_test".format(name),
@@ -289,6 +308,18 @@ def ios_extension_test_suite(name):
289308
],
290309
tags = [name],
291310
)
311+
analysis_output_group_info_dsymutil_bundle_files_test(
312+
name = "{}_with_runtime_framework_transitive_dsyms_output_group_dsymutil_bundle_files_test".format(name),
313+
target_under_test = "//test/starlark_tests/targets_under_test/ios:ext_with_fmwks_from_objc_swift_libraries_using_data",
314+
output_group_name = "dsyms",
315+
expected_outputs = [
316+
"ext_with_fmwks_from_objc_swift_libraries_using_data.appex.dSYM",
317+
"fmwk_min_os_baseline_with_bundle.framework.dSYM",
318+
"fmwk_no_version.framework.dSYM",
319+
"fmwk_with_resources.framework.dSYM",
320+
],
321+
tags = [name],
322+
)
292323
analysis_output_group_info_files_test(
293324
name = "{}_with_runtime_framework_transitive_linkmaps_output_group_info_test".format(name),
294325
target_under_test = "//test/starlark_tests/targets_under_test/ios:ext_with_fmwks_from_objc_swift_libraries_using_data",
@@ -321,6 +352,20 @@ def ios_extension_test_suite(name):
321352
],
322353
tags = [name],
323354
)
355+
apple_dsym_bundle_info_dsymutil_bundle_test(
356+
name = "{}_with_runtime_framework_dsym_bundle_info_dsymutil_bundle_files_test".format(name),
357+
target_under_test = "//test/starlark_tests/targets_under_test/ios:ext_with_fmwks_from_objc_swift_libraries_using_data",
358+
expected_direct_dsyms = [
359+
"ext_with_fmwks_from_objc_swift_libraries_using_data.appex.dSYM",
360+
],
361+
expected_transitive_dsyms = [
362+
"ext_with_fmwks_from_objc_swift_libraries_using_data.appex.dSYM",
363+
"fmwk_min_os_baseline_with_bundle.framework.dSYM",
364+
"fmwk_no_version.framework.dSYM",
365+
"fmwk_with_resources.framework.dSYM",
366+
],
367+
tags = [name],
368+
)
324369

325370
infoplist_contents_test(
326371
name = "{}_capability_set_derived_bundle_id_plist_test".format(name),

‎test/starlark_tests/ios_framework_tests.bzl‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,12 @@ load(
2020
)
2121
load(
2222
"//test/starlark_tests/rules:analysis_output_group_info_files_test.bzl",
23+
"analysis_output_group_info_dsymutil_bundle_files_test",
2324
"analysis_output_group_info_files_test",
2425
)
2526
load(
2627
"//test/starlark_tests/rules:apple_dsym_bundle_info_test.bzl",
28+
"apple_dsym_bundle_info_dsymutil_bundle_test",
2729
"apple_dsym_bundle_info_test",
2830
)
2931
load(
@@ -648,6 +650,18 @@ def ios_framework_test_suite(name):
648650
],
649651
tags = [name],
650652
)
653+
analysis_output_group_info_dsymutil_bundle_files_test(
654+
name = "{}_with_runtime_framework_transitive_dsyms_output_group_info_dsymutil_bundle_test".format(name),
655+
target_under_test = "//test/starlark_tests/targets_under_test/ios:fmwk_with_fmwks_from_objc_swift_libraries_using_data",
656+
output_group_name = "dsyms",
657+
expected_outputs = [
658+
"fmwk_with_fmwks_from_objc_swift_libraries_using_data.framework.dSYM",
659+
"fmwk_min_os_baseline_with_bundle.framework.dSYM",
660+
"fmwk_no_version.framework.dSYM",
661+
"fmwk_with_resources.framework.dSYM",
662+
],
663+
tags = [name],
664+
)
651665
analysis_output_group_info_files_test(
652666
name = "{}_with_runtime_framework_transitive_linkmaps_output_group_info_test".format(name),
653667
target_under_test = "//test/starlark_tests/targets_under_test/ios:fmwk_with_fmwks_from_objc_swift_libraries_using_data",
@@ -680,6 +694,20 @@ def ios_framework_test_suite(name):
680694
],
681695
tags = [name],
682696
)
697+
apple_dsym_bundle_info_dsymutil_bundle_test(
698+
name = "{}_with_runtime_framework_dsym_bundle_info_dsymutil_bundle_test".format(name),
699+
target_under_test = "//test/starlark_tests/targets_under_test/ios:fmwk_with_fmwks_from_objc_swift_libraries_using_data",
700+
expected_direct_dsyms = [
701+
"fmwk_with_fmwks_from_objc_swift_libraries_using_data.framework.dSYM",
702+
],
703+
expected_transitive_dsyms = [
704+
"fmwk_with_fmwks_from_objc_swift_libraries_using_data.framework.dSYM",
705+
"fmwk_min_os_baseline_with_bundle.framework.dSYM",
706+
"fmwk_no_version.framework.dSYM",
707+
"fmwk_with_resources.framework.dSYM",
708+
],
709+
tags = [name],
710+
)
683711

684712
infoplist_contents_test(
685713
name = "{}_base_bundle_id_derived_bundle_id_plist_test".format(name),

‎test/starlark_tests/ios_ui_test_tests.bzl‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,12 @@ load(
2020
)
2121
load(
2222
"//test/starlark_tests/rules:analysis_output_group_info_files_test.bzl",
23+
"analysis_output_group_info_dsymutil_bundle_files_test",
2324
"analysis_output_group_info_files_test",
2425
)
2526
load(
2627
"//test/starlark_tests/rules:apple_dsym_bundle_info_test.bzl",
28+
"apple_dsym_bundle_info_dsymutil_bundle_test",
2729
"apple_dsym_bundle_info_test",
2830
)
2931
load(
@@ -93,13 +95,30 @@ def ios_ui_test_test_suite(name):
9395
],
9496
tags = [name],
9597
)
98+
analysis_output_group_info_dsymutil_bundle_files_test(
99+
name = "{}_dsyms_output_group_info_dsymutil_bundle_test".format(name),
100+
target_under_test = "//test/starlark_tests/targets_under_test/ios:ui_test",
101+
output_group_name = "dsyms",
102+
expected_outputs = [
103+
"app.app.dSYM",
104+
"ui_test.xctest.dSYM",
105+
],
106+
tags = [name],
107+
)
96108
apple_dsym_bundle_info_test(
97109
name = "{}_apple_dsym_bundle_info_test".format(name),
98110
target_under_test = "//test/starlark_tests/targets_under_test/ios:ui_test",
99111
expected_direct_dsyms = ["dSYMs/ui_test.xctest.dSYM"],
100112
expected_transitive_dsyms = ["dSYMs/app.app.dSYM", "dSYMs/ui_test.xctest.dSYM"],
101113
tags = [name],
102114
)
115+
apple_dsym_bundle_info_dsymutil_bundle_test(
116+
name = "{}_apple_dsym_bundle_info_dsymutil_bundle_test".format(name),
117+
target_under_test = "//test/starlark_tests/targets_under_test/ios:ui_test",
118+
expected_direct_dsyms = ["ui_test.xctest.dSYM"],
119+
expected_transitive_dsyms = ["app.app.dSYM", "ui_test.xctest.dSYM"],
120+
tags = [name],
121+
)
103122

104123
infoplist_contents_test(
105124
name = "{}_test_bundle_id_override".format(name),

‎test/starlark_tests/ios_unit_test_tests.bzl‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,12 @@ load(
2424
)
2525
load(
2626
"//test/starlark_tests/rules:analysis_output_group_info_files_test.bzl",
27+
"analysis_output_group_info_dsymutil_bundle_files_test",
2728
"analysis_output_group_info_files_test",
2829
)
2930
load(
3031
"//test/starlark_tests/rules:apple_dsym_bundle_info_test.bzl",
32+
"apple_dsym_bundle_info_dsymutil_bundle_test",
3133
"apple_dsym_bundle_info_test",
3234
)
3335
load(
@@ -103,13 +105,30 @@ def ios_unit_test_test_suite(name):
103105
],
104106
tags = [name],
105107
)
108+
analysis_output_group_info_dsymutil_bundle_files_test(
109+
name = "{}_dsyms_output_group_info_dsymutil_bundle_test".format(name),
110+
target_under_test = "//test/starlark_tests/targets_under_test/ios:unit_test",
111+
output_group_name = "dsyms",
112+
expected_outputs = [
113+
"app.app.dSYM",
114+
"unit_test.xctest.dSYM",
115+
],
116+
tags = [name],
117+
)
106118
apple_dsym_bundle_info_test(
107119
name = "{}_apple_dsym_bundle_info_test".format(name),
108120
target_under_test = "//test/starlark_tests/targets_under_test/ios:unit_test",
109121
expected_direct_dsyms = ["dSYMs/unit_test.xctest.dSYM"],
110122
expected_transitive_dsyms = ["dSYMs/app.app.dSYM", "dSYMs/unit_test.xctest.dSYM"],
111123
tags = [name],
112124
)
125+
apple_dsym_bundle_info_dsymutil_bundle_test(
126+
name = "{}_apple_dsym_bundle_info_dsymutil_bundle_test".format(name),
127+
target_under_test = "//test/starlark_tests/targets_under_test/ios:unit_test",
128+
expected_direct_dsyms = ["unit_test.xctest.dSYM"],
129+
expected_transitive_dsyms = ["app.app.dSYM", "unit_test.xctest.dSYM"],
130+
tags = [name],
131+
)
113132

114133
infoplist_contents_test(
115134
name = "{}_test_bundle_id_override".format(name),

‎test/starlark_tests/macos_bundle_tests.bzl‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,12 @@
1616

1717
load(
1818
"//test/starlark_tests/rules:analysis_output_group_info_files_test.bzl",
19+
"analysis_output_group_info_dsymutil_bundle_files_test",
1920
"analysis_output_group_info_files_test",
2021
)
2122
load(
2223
"//test/starlark_tests/rules:apple_dsym_bundle_info_test.bzl",
24+
"apple_dsym_bundle_info_dsymutil_bundle_test",
2325
"apple_dsym_bundle_info_test",
2426
)
2527
load(
@@ -163,13 +165,29 @@ def macos_bundle_test_suite(name):
163165
],
164166
tags = [name],
165167
)
168+
analysis_output_group_info_dsymutil_bundle_files_test(
169+
name = "{}_dsyms_output_group_info_dsymutil_bundle_test".format(name),
170+
target_under_test = "//test/starlark_tests/targets_under_test/macos:bundle",
171+
output_group_name = "dsyms",
172+
expected_outputs = [
173+
"bundle.bundle.dSYM",
174+
],
175+
tags = [name],
176+
)
166177
apple_dsym_bundle_info_test(
167178
name = "{}_dsym_bundle_info_files_test".format(name),
168179
target_under_test = "//test/starlark_tests/targets_under_test/macos:bundle",
169180
expected_direct_dsyms = ["dSYMs/bundle.bundle.dSYM"],
170181
expected_transitive_dsyms = ["dSYMs/bundle.bundle.dSYM"],
171182
tags = [name],
172183
)
184+
apple_dsym_bundle_info_dsymutil_bundle_test(
185+
name = "{}_dsym_bundle_info_dsymutil_bundle_test".format(name),
186+
target_under_test = "//test/starlark_tests/targets_under_test/macos:bundle",
187+
expected_direct_dsyms = ["bundle.bundle.dSYM"],
188+
expected_transitive_dsyms = ["bundle.bundle.dSYM"],
189+
tags = [name],
190+
)
173191

174192
infoplist_contents_test(
175193
name = "{}_capability_set_derived_bundle_id_plist_test".format(name),

0 commit comments

Comments
 (0)