Update tests to cover watchOS device arm64, and to test the results of dSYM bundles within tree artifacts at test execution time rather than just analysis time.

Cherry-pick: 39aeac6

Author: nglevin

test/starlark_tests/apple_xcframework_tests.bzl

@@ -377,6 +377,25 @@ def apple_xcframework_test_suite(name):
         tags = [name],
     )
 
+    directory_test(
+        name = "{}_dsym_directory_test".format(name),
+        apple_generate_dsym = True,
+        build_type = "device",
+        compilation_mode = "opt",
+        target_under_test = "//test/starlark_tests/targets_under_test/apple:ios_dynamic_lipoed_xcframework",
+        expected_directories = {
+            "ios_dynamic_lipoed_xcframework_ios_device.framework.dSYM": [
+                "Contents/Resources/DWARF/ios_dynamic_lipoed_xcframework_bin",
+                "Contents/Info.plist",
+            ],
+            "ios_dynamic_lipoed_xcframework_ios_simulator.framework.dSYM": [
+                "Contents/Resources/DWARF/ios_dynamic_lipoed_xcframework_bin",
+                "Contents/Info.plist",
+            ],
+        },
+        tags = [name],
+    )
+
     linkmap_test(
         name = "{}_device_linkmap_test".format(name),
         target_under_test = "//test/starlark_tests/targets_under_test/apple:ios_dynamic_xcframework",

test/starlark_tests/ios_application_tests.bzl

@@ -54,6 +54,10 @@ load(
     "apple_symbols_file_test",
     "archive_contents_test",
 )
+load(
+    "//test/starlark_tests/rules:directory_test.bzl",
+    "directory_test",
+)
 load(
     "//test/starlark_tests/rules:entitlements_contents_test.bzl",
     "entitlements_contents_test",
@@ -831,6 +835,21 @@ def ios_application_test_suite(name):
         tags = [name],
     )
 
+    directory_test(
+        name = "{}_dsym_directory_test".format(name),
+        apple_generate_dsym = True,
+        build_type = "device",
+        compilation_mode = "opt",
+        target_under_test = "//test/starlark_tests/targets_under_test/ios:app",
+        expected_directories = {
+            "app.app.dSYM": [
+                "Contents/Resources/DWARF/app_bin",
+                "Contents/Info.plist",
+            ],
+        },
+        tags = [name],
+    )
+
     output_group_zip_contents_test(
         name = "{}_has_combined_zip_output_group".format(name),
         build_type = "device",

test/starlark_tests/macos_application_tests.bzl

@@ -46,6 +46,10 @@ load(
     "apple_symbols_file_test",
     "archive_contents_test",
 )
+load(
+    "//test/starlark_tests/rules:directory_test.bzl",
+    "directory_test",
+)
 load(
     "//test/starlark_tests/rules:infoplist_contents_test.bzl",
     "infoplist_contents_test",
@@ -453,6 +457,21 @@ def macos_application_test_suite(name):
         tags = [name],
     )
 
+    directory_test(
+        name = "{}_dsym_directory_test".format(name),
+        apple_generate_dsym = True,
+        build_type = "device",
+        compilation_mode = "opt",
+        target_under_test = "//test/starlark_tests/targets_under_test/macos:app",
+        expected_directories = {
+            "app.app.dSYM": [
+                "Contents/Resources/DWARF/app_bin",
+                "Contents/Info.plist",
+            ],
+        },
+        tags = [name],
+    )
+
     infoplist_contents_test(
         name = "{}_plist_test".format(name),
         target_under_test = "//test/starlark_tests/targets_under_test/macos:app",

test/starlark_tests/rules/apple_verification_test.bzl

@@ -103,7 +103,7 @@ Internal Error: A verification test should only specify `apple_platforms` or `cp
         output_dictionary.update({
             "//command_line_option:ios_multi_cpus": "arm64,arm64e",
             "//command_line_option:tvos_cpus": "arm64",
-            "//command_line_option:watchos_cpus": "arm64_32,armv7k",
+            "//command_line_option:watchos_cpus": "device_arm64,arm64_32,armv7k",
         })
 
         if _supports_visionos:

test/starlark_tests/tvos_application_tests.bzl

@@ -40,6 +40,10 @@ load(
     "//test/starlark_tests/rules:common_verification_tests.bzl",
     "archive_contents_test",
 )
+load(
+    "//test/starlark_tests/rules:directory_test.bzl",
+    "directory_test",
+)
 load(
     "//test/starlark_tests/rules:infoplist_contents_test.bzl",
     "infoplist_contents_test",
@@ -269,6 +273,21 @@ def tvos_application_test_suite(name):
         tags = [name],
     )
 
+    directory_test(
+        name = "{}_dsym_directory_test".format(name),
+        apple_generate_dsym = True,
+        build_type = "device",
+        compilation_mode = "opt",
+        target_under_test = "//test/starlark_tests/targets_under_test/tvos:app",
+        expected_directories = {
+            "app.app.dSYM": [
+                "Contents/Resources/DWARF/app_bin",
+                "Contents/Info.plist",
+            ],
+        },
+        tags = [name],
+    )
+
     infoplist_contents_test(
         name = "{}_plist_test".format(name),
         target_under_test = "//test/starlark_tests/targets_under_test/tvos:app",

test/starlark_tests/visionos_application_tests.bzl

@@ -40,6 +40,10 @@ load(
     "//test/starlark_tests/rules:common_verification_tests.bzl",
     "archive_contents_test",
 )
+load(
+    "//test/starlark_tests/rules:directory_test.bzl",
+    "directory_test",
+)
 load(
     "//test/starlark_tests/rules:infoplist_contents_test.bzl",
     "infoplist_contents_test",
@@ -220,6 +224,21 @@ def visionos_application_test_suite(name):
         ],
     )
 
+    directory_test(
+        name = "{}_dsym_directory_test".format(name),
+        apple_generate_dsym = True,
+        build_type = "device",
+        compilation_mode = "opt",
+        target_under_test = "//test/starlark_tests/targets_under_test/visionos:app",
+        expected_directories = {
+            "app.app.dSYM": [
+                "Contents/Resources/DWARF/app_bin",
+                "Contents/Info.plist",
+            ],
+        },
+        tags = [name],
+    )
+
     infoplist_contents_test(
         name = "{}_plist_test".format(name),
         target_under_test = "//test/starlark_tests/targets_under_test/visionos:app",

test/starlark_tests/watchos_single_target_application_tests.bzl

@@ -35,6 +35,10 @@ load(
     "archive_contents_test",
     "binary_contents_test",
 )
+load(
+    "//test/starlark_tests/rules:directory_test.bzl",
+    "directory_test",
+)
 load(
     "//test/starlark_tests/rules:infoplist_contents_test.bzl",
     "infoplist_contents_test",
@@ -287,6 +291,21 @@ delegate is referenced in the single-target `watchos_application`'s `deps`.
         tags = [name],
     )
 
+    directory_test(
+        name = "{}_dsym_directory_test".format(name),
+        apple_generate_dsym = True,
+        build_type = "device",
+        compilation_mode = "opt",
+        target_under_test = "//test/starlark_tests/targets_under_test/watchos:single_target_app",
+        expected_directories = {
+            "single_target_app.app.dSYM": [
+                "Contents/Resources/DWARF/single_target_app_bin",
+                "Contents/Info.plist",
+            ],
+        },
+        tags = [name],
+    )
+
     native.test_suite(
         name = name,
         tags = [