Fix labels for Bazel HEAD (#330)upstream-master

Needed to cherry-pick d5a60a61d05cb1bfaaf690a5bec532f278421202.

5 files changed, 33 insertions, 41 deletions

diff --git a/test/available_xcodes_test.bzl b/test/available_xcodes_test.bzl
index 49aa6ea..04e18d2 100644
--- a/test/available_xcodes_test.bzl
+++ b/test/available_xcodes_test.bzl
@@ -15,14 +15,8 @@
 """Tests for the `available_xcodes` rule."""
 
 load("@bazel_skylib//lib:unittest.bzl", "analysistest")
-load(
-    "@build_bazel_apple_support//xcode:available_xcodes.bzl",
-    "available_xcodes",
-)
-load(
-    "@build_bazel_apple_support//xcode:xcode_version.bzl",
-    "xcode_version",
-)
+load("//xcode:available_xcodes.bzl", "available_xcodes")
+load("//xcode:xcode_version.bzl", "xcode_version")
 load(":test_helpers.bzl", "FIXTURE_TAGS", "make_all_tests")
 
 visibility("private")
diff --git a/test/shell/BUILD b/test/shell/BUILD
index 32a3f1c..bfcadeb 100644
--- a/test/shell/BUILD
+++ b/test/shell/BUILD
@@ -4,8 +4,8 @@ filegroup(
     name = "for_bazel_tests",
     testonly = True,
     srcs = [
+        "//:for_bazel_tests",
         "//test:for_bazel_tests",
-        "@build_bazel_apple_support//:for_bazel_tests",
     ],
 )
 
diff --git a/test/xcode_config_test.bzl b/test/xcode_config_test.bzl
index cae4c12..1aa28ec 100644
--- a/test/xcode_config_test.bzl
+++ b/test/xcode_config_test.bzl
@@ -15,18 +15,9 @@
 """Tests for the `xcode_config` rule."""
 
 load("@bazel_skylib//lib:unittest.bzl", "analysistest", "asserts")
-load(
-    "@build_bazel_apple_support//xcode:available_xcodes.bzl",
-    "available_xcodes",
-)
-load(
-    "@build_bazel_apple_support//xcode:xcode_config.bzl",
-    "xcode_config",
-)
-load(
-    "@build_bazel_apple_support//xcode:xcode_version.bzl",
-    "xcode_version",
-)
+load("//xcode:available_xcodes.bzl", "available_xcodes")
+load("//xcode:xcode_config.bzl", "xcode_config")
+load("//xcode:xcode_version.bzl", "xcode_version")
 load(":test_helpers.bzl", "FIXTURE_TAGS", "make_all_tests")
 
 visibility("private")
@@ -233,7 +224,9 @@ _accepts_flag_for_mutually_available_test = analysistest.make(
     _accepts_flag_for_mutually_available_test_impl,
     config_settings = {
         "//command_line_option:xcode_version": "8.4",
-        "//command_line_option:xcode_version_config": "@build_bazel_apple_support//test:accepts_flag_for_mutually_available__foo",
+        "//command_line_option:xcode_version_config": str(Label(
+            "//test:accepts_flag_for_mutually_available__foo",
+        )),
     },
 )
 
@@ -276,7 +269,9 @@ _prefers_flag_over_mutually_available_test = analysistest.make(
     _prefers_flag_over_mutually_available_test_impl,
     config_settings = {
         "//command_line_option:xcode_version": "5.1.2",
-        "//command_line_option:xcode_version_config": "@build_bazel_apple_support//test:prefers_flag_over_mutually_available__foo",
+        "//command_line_option:xcode_version_config": str(Label(
+            "//test:prefers_flag_over_mutually_available__foo",
+        )),
     },
 )
 
@@ -322,7 +317,9 @@ _warn_with_explicit_local_only_version_test = analysistest.make(
     _warn_with_explicit_local_only_version_test_impl,
     config_settings = {
         "//command_line_option:xcode_version": "8.4",
-        "//command_line_option:xcode_version_config": "@build_bazel_apple_support//test:warn_with_explicit_local_only_version__foo",
+        "//command_line_option:xcode_version_config": str(Label(
+            "//test:warn_with_explicit_local_only_version__foo",
+        )),
     },
 )
 
@@ -367,7 +364,9 @@ def _prefer_local_default_if_no_mutual_no_flag_different_main_version_test_impl(
 _prefer_local_default_if_no_mutual_no_flag_different_main_version_test = analysistest.make(
     _prefer_local_default_if_no_mutual_no_flag_different_main_version_test_impl,
     config_settings = {
-        "//command_line_option:xcode_version_config": "@build_bazel_apple_support//test:prefer_local_default_if_no_mutual_no_flag_different_main_version__foo",
+        "//command_line_option:xcode_version_config": str(Label(
+            "//test:prefer_local_default_if_no_mutual_no_flag_different_main_version__foo",
+        )),
     },
 )
 
@@ -412,7 +411,9 @@ def _prefer_local_default_if_no_mutual_no_flag_different_build_alias_test_impl(c
 _prefer_local_default_if_no_mutual_no_flag_different_build_alias_test = analysistest.make(
     _prefer_local_default_if_no_mutual_no_flag_different_build_alias_test_impl,
     config_settings = {
-        "//command_line_option:xcode_version_config": "@build_bazel_apple_support//test:prefer_local_default_if_no_mutual_no_flag_different_build_alias__foo",
+        "//command_line_option:xcode_version_config": str(Label(
+            "//test:prefer_local_default_if_no_mutual_no_flag_different_build_alias__foo",
+        )),
     },
 )
 
@@ -457,7 +458,9 @@ def _prefer_local_default_if_no_mutual_no_flag_different_full_version_test_impl(
 _prefer_local_default_if_no_mutual_no_flag_different_full_version_test = analysistest.make(
     _prefer_local_default_if_no_mutual_no_flag_different_full_version_test_impl,
     config_settings = {
-        "//command_line_option:xcode_version_config": "@build_bazel_apple_support//test:prefer_local_default_if_no_mutual_no_flag_different_full_version__foo",
+        "//command_line_option:xcode_version_config": str(Label(
+            "//test:prefer_local_default_if_no_mutual_no_flag_different_full_version__foo",
+        )),
     },
 )
 
@@ -505,7 +508,9 @@ def _choose_newest_mutual_xcode_test_impl(ctx):
 _choose_newest_mutual_xcode_test = analysistest.make(
     _choose_newest_mutual_xcode_test_impl,
     config_settings = {
-        "//command_line_option:xcode_version_config": "@build_bazel_apple_support//test:choose_newest_mutual_xcode__foo",
+        "//command_line_option:xcode_version_config": str(Label(
+            "//test:choose_newest_mutual_xcode__foo",
+        )),
     },
 )
 
@@ -541,7 +546,9 @@ _invalid_xcode_from_mutual_throws_test = analysistest.make(
     _invalid_xcode_from_mutual_throws_test_impl,
     config_settings = {
         "//command_line_option:xcode_version": "6",
-        "//command_line_option:xcode_version_config": "@build_bazel_apple_support//test:invalid_xcode_from_mutual_throws__foo",
+        "//command_line_option:xcode_version_config": str(Label(
+            "//test:invalid_xcode_from_mutual_throws__foo",
+        )),
     },
     expect_failure = True,
 )
diff --git a/test/xcode_support_test.bzl b/test/xcode_support_test.bzl
index e10a949..9fdcdf2 100644
--- a/test/xcode_support_test.bzl
+++ b/test/xcode_support_test.bzl
@@ -13,14 +13,8 @@
 # limitations under the License.
 """Definition of a test rule to test xcode_support."""
 
-load(
-    "//lib:apple_support.bzl",
-    "apple_support",
-)
-load(
-    "//lib:xcode_support.bzl",
-    "xcode_support",
-)
+load("//lib:apple_support.bzl", "apple_support")
+load("//lib:xcode_support.bzl", "xcode_support")
 
 # Template for the test script used to validate that the action outputs contain the expected
 # values.
diff --git a/test/xcode_version_test.bzl b/test/xcode_version_test.bzl
index 19b38b2..1518a05 100644
--- a/test/xcode_version_test.bzl
+++ b/test/xcode_version_test.bzl
@@ -15,10 +15,7 @@
 """Tests for the `xcode_version` rule."""
 
 load("@bazel_skylib//lib:unittest.bzl", "analysistest", "asserts")
-load(
-    "@build_bazel_apple_support//xcode:xcode_version.bzl",
-    "xcode_version",
-)
+load("//xcode:xcode_version.bzl", "xcode_version")
 load(":test_helpers.bzl", "FIXTURE_TAGS", "make_all_tests")
 
 visibility("private")