Enable visionOS tests always

bazelbuild · Jan 22, 2024 · 729f618 · 729f618
1 parent a233056
commit 729f618
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 111 deletions.
diff --git a/BUILD b/BUILD
@@ -1,5 +1,3 @@
-load("@bazel_skylib//rules:common_settings.bzl", "bool_flag")
-
 licenses(["notice"])
 
 exports_files(["LICENSE"])
@@ -35,20 +33,3 @@ filegroup(
         "//:__subpackages__",
     ],
 )
-
-config_setting(
-    name = "supports_visionos_setting",
-    flag_values = {
-        ":supports_visionos": "True",
-    },
-    visibility = [
-        "//examples:__subpackages__",
-        "//test:__subpackages__",
-    ],
-)
-
-bool_flag(
-    name = "supports_visionos",
-    build_setting_default = False,
-    visibility = ["//visibility:private"],
-)
diff --git a/examples/visionos/HelloWorld/BUILD b/examples/visionos/HelloWorld/BUILD
@@ -28,20 +28,12 @@ visionos_application(
     bundle_id = "com.example.hello-world",
     infoplists = [":Info.plist"],
     minimum_os_version = "1.0",
-    target_compatible_with = select({
-        "//:supports_visionos_setting": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
     version = ":HelloWorldVersion",
     deps = [":Sources"],
 )
 
 build_test(
     name = "HelloWorldBuildTest",
-    target_compatible_with = select({
-        "//:supports_visionos_setting": [],
-        "//conditions:default": ["@platforms//:incompatible"],
-    }),
     targets = [
         ":HelloWorld",
     ],

diff --git a/test/starlark_tests/apple_static_library_tests.bzl b/test/starlark_tests/apple_static_library_tests.bzl
@@ -354,10 +354,6 @@ def apple_static_library_test_suite(name):
         tags = [
             name,
         ],
-        target_compatible_with = select({
-            "//:supports_visionos_setting": [],
-            "//conditions:default": ["@platforms//:incompatible"],
-        }),
     )
 
     native.test_suite(

diff --git a/test/starlark_tests/visionos_application_tests.bzl b/test/starlark_tests/visionos_application_tests.bzl
@@ -63,10 +63,6 @@ def visionos_application_test_suite(name):
         tags = [
             name,
         ],
-        target_compatible_with = select({
-            "//:supports_visionos_setting": [],
-            "//conditions:default": ["@platforms//:incompatible"],
-        }),
     )
 
     archive_contents_test(
@@ -84,10 +80,6 @@ def visionos_application_test_suite(name):
             name,
             "needs-xcode-latest-beta",
         ],
-        target_compatible_with = select({
-            "//:supports_visionos_setting": [],
-            "//conditions:default": ["@platforms//:incompatible"],
-        }),
     )
 
     archive_contents_test(
@@ -100,10 +92,6 @@ def visionos_application_test_suite(name):
         tags = [
             name,
         ],
-        target_compatible_with = select({
-            "//:supports_visionos_setting": [],
-            "//conditions:default": ["@platforms//:incompatible"],
-        }),
     )
 
     archive_contents_test(
@@ -119,10 +107,6 @@ def visionos_application_test_suite(name):
         tags = [
             name,
         ],
-        target_compatible_with = select({
-            "//:supports_visionos_setting": [],
-            "//conditions:default": ["@platforms//:incompatible"],
-        }),
     )
 
     archive_contents_test(
@@ -137,10 +121,6 @@ def visionos_application_test_suite(name):
         tags = [
             name,
         ],
-        target_compatible_with = select({
-            "//:supports_visionos_setting": [],
-            "//conditions:default": ["@platforms//:incompatible"],
-        }),
     )
 
     archive_contents_test(
@@ -153,10 +133,6 @@ def visionos_application_test_suite(name):
         tags = [
             name,
         ],
-        target_compatible_with = select({
-            "//:supports_visionos_setting": [],
-            "//conditions:default": ["@platforms//:incompatible"],
-        }),
     )
 
     archive_contents_test(
@@ -171,10 +147,6 @@ def visionos_application_test_suite(name):
         tags = [
             name,
         ],
-        target_compatible_with = select({
-            "//:supports_visionos_setting": [],
-            "//conditions:default": ["@platforms//:incompatible"],
-        }),
     )
 
     archive_contents_test(
@@ -189,10 +161,6 @@ def visionos_application_test_suite(name):
         tags = [
             name,
         ],
-        target_compatible_with = select({
-            "//:supports_visionos_setting": [],
-            "//conditions:default": ["@platforms//:incompatible"],
-        }),
     )
 
     analysis_output_group_info_files_test(
@@ -206,10 +174,6 @@ def visionos_application_test_suite(name):
         tags = [
             name,
         ],
-        target_compatible_with = select({
-            "//:supports_visionos_setting": [],
-            "//conditions:default": ["@platforms//:incompatible"],
-        }),
     )
 
     apple_dsym_bundle_info_test(
@@ -224,10 +188,6 @@ def visionos_application_test_suite(name):
         tags = [
             name,
         ],
-        target_compatible_with = select({
-            "//:supports_visionos_setting": [],
-            "//conditions:default": ["@platforms//:incompatible"],
-        }),
     )
 
     infoplist_contents_test(
@@ -254,10 +214,6 @@ def visionos_application_test_suite(name):
         tags = [
             name,
         ],
-        target_compatible_with = select({
-            "//:supports_visionos_setting": [],
-            "//conditions:default": ["@platforms//:incompatible"],
-        }),
     )
 
     # Tests that the linkmap outputs are produced when `--objc_generate_linkmap`
@@ -268,10 +224,6 @@ def visionos_application_test_suite(name):
         tags = [
             name,
         ],
-        target_compatible_with = select({
-            "//:supports_visionos_setting": [],
-            "//conditions:default": ["@platforms//:incompatible"],
-        }),
     )
 
     analysis_output_group_info_files_test(
@@ -285,10 +237,6 @@ def visionos_application_test_suite(name):
         tags = [
             name,
         ],
-        target_compatible_with = select({
-            "//:supports_visionos_setting": [],
-            "//conditions:default": ["@platforms//:incompatible"],
-        }),
     )
 
     # Tests that the provisioning profile is present when built for device.
@@ -302,10 +250,6 @@ def visionos_application_test_suite(name):
         tags = [
             name,
         ],
-        target_compatible_with = select({
-            "//:supports_visionos_setting": [],
-            "//conditions:default": ["@platforms//:incompatible"],
-        }),
     )
 
     archive_contents_test(
@@ -319,10 +263,6 @@ def visionos_application_test_suite(name):
         tags = [
             name,
         ],
-        target_compatible_with = select({
-            "//:supports_visionos_setting": [],
-            "//conditions:default": ["@platforms//:incompatible"],
-        }),
     )
 
     archive_contents_test(
@@ -336,10 +276,6 @@ def visionos_application_test_suite(name):
         tags = [
             name,
         ],
-        target_compatible_with = select({
-            "//:supports_visionos_setting": [],
-            "//conditions:default": ["@platforms//:incompatible"],
-        }),
     )
 
     archive_contents_test(
@@ -353,10 +289,6 @@ def visionos_application_test_suite(name):
         tags = [
             name,
         ],
-        target_compatible_with = select({
-            "//:supports_visionos_setting": [],
-            "//conditions:default": ["@platforms//:incompatible"],
-        }),
     )
 
     archive_contents_test(
@@ -370,10 +302,6 @@ def visionos_application_test_suite(name):
         tags = [
             name,
         ],
-        target_compatible_with = select({
-            "//:supports_visionos_setting": [],
-            "//conditions:default": ["@platforms//:incompatible"],
-        }),
     )
 
     archive_contents_test(
@@ -387,10 +315,6 @@ def visionos_application_test_suite(name):
         tags = [
             name,
         ],
-        target_compatible_with = select({
-            "//:supports_visionos_setting": [],
-            "//conditions:default": ["@platforms//:incompatible"],
-        }),
     )
 
     apple_codesigning_dossier_info_provider_test(
@@ -400,10 +324,6 @@ def visionos_application_test_suite(name):
         tags = [
             name,
         ],
-        target_compatible_with = select({
-            "//:supports_visionos_setting": [],
-            "//conditions:default": ["@platforms//:incompatible"],
-        }),
     )
 
     # TODO(b/288582842): Support an IPA output via this output group. This will require some changes