Update all

bazelbuild · Mar 12, 2021 · 9cd7c7e · 9cd7c7e
1 parent 336d721
commit 9cd7c7e
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 30 deletions.
diff --git a/test/BUILD b/test/BUILD
@@ -32,11 +32,3 @@ bzl_library(
         "//test/rules:starlark_tests_bzls",
     ],
 )
-
-# TODO: Remove once https://github.com/bazelbuild/bazel/pull/10945 lands
-config_setting(
-    name = "linux",
-    constraint_values = [
-        "@bazel_tools//platforms:linux",
-    ],
-)
diff --git a/test/coverage_settings_tests.bzl b/test/coverage_settings_tests.bzl
@@ -69,9 +69,7 @@ def coverage_settings_test_suite(name = "coverage_settings"):
             "-coverage-prefix-map",
             "__BAZEL_XCODE_DEVELOPER_DIR__=DEVELOPER_DIR",
         ],
-        target_compatible_with = [
-            "@platforms//os:macos",
-        ],
+        target_compatible_with = ["@platforms//os:macos"],
         mnemonic = "SwiftCompile",
         target_under_test = "@build_bazel_rules_swift//test/fixtures/debug_settings:simple",
     )
diff --git a/test/debug_settings_tests.bzl b/test/debug_settings_tests.bzl
@@ -225,13 +225,11 @@ def debug_settings_test_suite(name = "debug_settings"):
 
     xcode_remap_command_line_test(
         name = "{}_remap_xcode_path".format(name),
-        expected_argv = select({
-            "//test:linux": [],
-            "//conditions:default": [
-                "-debug-prefix-map",
-                "__BAZEL_XCODE_DEVELOPER_DIR__=DEVELOPER_DIR",
-            ],
-        }),
+        expected_argv = [
+            "-debug-prefix-map",
+            "__BAZEL_XCODE_DEVELOPER_DIR__=DEVELOPER_DIR",
+        ],
+        target_compatible_with = ["@platforms//os:macos"],
         mnemonic = "SwiftCompile",
         tags = [name],
         target_under_test = "@build_bazel_rules_swift//test/fixtures/debug_settings:simple",

diff --git a/test/split_derived_files_tests.bzl b/test/split_derived_files_tests.bzl
@@ -274,12 +274,8 @@ def split_derived_files_test_suite(name = "split_derived_files"):
 
     split_swiftmodule_bitcode_test(
         name = "{}_bitcode_compile".format(name),
-        expected_argv = select({
-            "//test:linux": [],
-            "//conditions:default": [
-                "-embed-bitcode",
-            ],
-        }),
+        expected_argv = ["-embed-bitcode"],
+        target_compatible_with = ["@platforms//os:macos"],
         mnemonic = "SwiftCompile",
         tags = [name],
         target_under_test = "@build_bazel_rules_swift//test/fixtures/debug_settings:simple",
@@ -297,12 +293,8 @@ def split_derived_files_test_suite(name = "split_derived_files"):
 
     split_swiftmodule_bitcode_markers_test(
         name = "{}_bitcode_markers_compile".format(name),
-        expected_argv = select({
-            "//test:linux": [],
-            "//conditions:default": [
-                "-embed-bitcode-marker",
-            ],
-        }),
+        expected_argv = ["-embed-bitcode-marker"],
+        target_compatible_with = ["@platforms//os:macos"],
         mnemonic = "SwiftCompile",
         tags = [name],
         target_under_test = "@build_bazel_rules_swift//test/fixtures/debug_settings:simple",