Skip to content

Commit 85792ef

Browse files
brentleyjonesbrentleyjones
authored
Fix labels for Bazel HEAD (#330)
Needed to cherry-pick d5a60a6.
1 parent ac15063 commit 85792ef

5 files changed

Lines changed: 33 additions & 41 deletions

File tree

‎test/available_xcodes_test.bzl‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,8 @@
1515
"""Tests for the `available_xcodes` rule."""
1616

1717
load("@bazel_skylib//lib:unittest.bzl", "analysistest")
18-
load(
19-
"@build_bazel_apple_support//xcode:available_xcodes.bzl",
20-
"available_xcodes",
21-
)
22-
load(
23-
"@build_bazel_apple_support//xcode:xcode_version.bzl",
24-
"xcode_version",
25-
)
18+
load("//xcode:available_xcodes.bzl", "available_xcodes")
19+
load("//xcode:xcode_version.bzl", "xcode_version")
2620
load(":test_helpers.bzl", "FIXTURE_TAGS", "make_all_tests")
2721

2822
visibility("private")

‎test/shell/BUILD‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ filegroup(
44
name = "for_bazel_tests",
55
testonly = True,
66
srcs = [
7+
"//:for_bazel_tests",
78
"//test:for_bazel_tests",
8-
"@build_bazel_apple_support//:for_bazel_tests",
99
],
1010
)
1111

‎test/xcode_config_test.bzl‎

Lines changed: 27 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,9 @@
1515
"""Tests for the `xcode_config` rule."""
1616

1717
load("@bazel_skylib//lib:unittest.bzl", "analysistest", "asserts")
18-
load(
19-
"@build_bazel_apple_support//xcode:available_xcodes.bzl",
20-
"available_xcodes",
21-
)
22-
load(
23-
"@build_bazel_apple_support//xcode:xcode_config.bzl",
24-
"xcode_config",
25-
)
26-
load(
27-
"@build_bazel_apple_support//xcode:xcode_version.bzl",
28-
"xcode_version",
29-
)
18+
load("//xcode:available_xcodes.bzl", "available_xcodes")
19+
load("//xcode:xcode_config.bzl", "xcode_config")
20+
load("//xcode:xcode_version.bzl", "xcode_version")
3021
load(":test_helpers.bzl", "FIXTURE_TAGS", "make_all_tests")
3122

3223
visibility("private")
@@ -233,7 +224,9 @@ _accepts_flag_for_mutually_available_test = analysistest.make(
233224
_accepts_flag_for_mutually_available_test_impl,
234225
config_settings = {
235226
"//command_line_option:xcode_version": "8.4",
236-
"//command_line_option:xcode_version_config": "@build_bazel_apple_support//test:accepts_flag_for_mutually_available__foo",
227+
"//command_line_option:xcode_version_config": str(Label(
228+
"//test:accepts_flag_for_mutually_available__foo",
229+
)),
237230
},
238231
)
239232

@@ -276,7 +269,9 @@ _prefers_flag_over_mutually_available_test = analysistest.make(
276269
_prefers_flag_over_mutually_available_test_impl,
277270
config_settings = {
278271
"//command_line_option:xcode_version": "5.1.2",
279-
"//command_line_option:xcode_version_config": "@build_bazel_apple_support//test:prefers_flag_over_mutually_available__foo",
272+
"//command_line_option:xcode_version_config": str(Label(
273+
"//test:prefers_flag_over_mutually_available__foo",
274+
)),
280275
},
281276
)
282277

@@ -322,7 +317,9 @@ _warn_with_explicit_local_only_version_test = analysistest.make(
322317
_warn_with_explicit_local_only_version_test_impl,
323318
config_settings = {
324319
"//command_line_option:xcode_version": "8.4",
325-
"//command_line_option:xcode_version_config": "@build_bazel_apple_support//test:warn_with_explicit_local_only_version__foo",
320+
"//command_line_option:xcode_version_config": str(Label(
321+
"//test:warn_with_explicit_local_only_version__foo",
322+
)),
326323
},
327324
)
328325

@@ -367,7 +364,9 @@ def _prefer_local_default_if_no_mutual_no_flag_different_main_version_test_impl(
367364
_prefer_local_default_if_no_mutual_no_flag_different_main_version_test = analysistest.make(
368365
_prefer_local_default_if_no_mutual_no_flag_different_main_version_test_impl,
369366
config_settings = {
370-
"//command_line_option:xcode_version_config": "@build_bazel_apple_support//test:prefer_local_default_if_no_mutual_no_flag_different_main_version__foo",
367+
"//command_line_option:xcode_version_config": str(Label(
368+
"//test:prefer_local_default_if_no_mutual_no_flag_different_main_version__foo",
369+
)),
371370
},
372371
)
373372

@@ -412,7 +411,9 @@ def _prefer_local_default_if_no_mutual_no_flag_different_build_alias_test_impl(c
412411
_prefer_local_default_if_no_mutual_no_flag_different_build_alias_test = analysistest.make(
413412
_prefer_local_default_if_no_mutual_no_flag_different_build_alias_test_impl,
414413
config_settings = {
415-
"//command_line_option:xcode_version_config": "@build_bazel_apple_support//test:prefer_local_default_if_no_mutual_no_flag_different_build_alias__foo",
414+
"//command_line_option:xcode_version_config": str(Label(
415+
"//test:prefer_local_default_if_no_mutual_no_flag_different_build_alias__foo",
416+
)),
416417
},
417418
)
418419

@@ -457,7 +458,9 @@ def _prefer_local_default_if_no_mutual_no_flag_different_full_version_test_impl(
457458
_prefer_local_default_if_no_mutual_no_flag_different_full_version_test = analysistest.make(
458459
_prefer_local_default_if_no_mutual_no_flag_different_full_version_test_impl,
459460
config_settings = {
460-
"//command_line_option:xcode_version_config": "@build_bazel_apple_support//test:prefer_local_default_if_no_mutual_no_flag_different_full_version__foo",
461+
"//command_line_option:xcode_version_config": str(Label(
462+
"//test:prefer_local_default_if_no_mutual_no_flag_different_full_version__foo",
463+
)),
461464
},
462465
)
463466

@@ -505,7 +508,9 @@ def _choose_newest_mutual_xcode_test_impl(ctx):
505508
_choose_newest_mutual_xcode_test = analysistest.make(
506509
_choose_newest_mutual_xcode_test_impl,
507510
config_settings = {
508-
"//command_line_option:xcode_version_config": "@build_bazel_apple_support//test:choose_newest_mutual_xcode__foo",
511+
"//command_line_option:xcode_version_config": str(Label(
512+
"//test:choose_newest_mutual_xcode__foo",
513+
)),
509514
},
510515
)
511516

@@ -541,7 +546,9 @@ _invalid_xcode_from_mutual_throws_test = analysistest.make(
541546
_invalid_xcode_from_mutual_throws_test_impl,
542547
config_settings = {
543548
"//command_line_option:xcode_version": "6",
544-
"//command_line_option:xcode_version_config": "@build_bazel_apple_support//test:invalid_xcode_from_mutual_throws__foo",
549+
"//command_line_option:xcode_version_config": str(Label(
550+
"//test:invalid_xcode_from_mutual_throws__foo",
551+
)),
545552
},
546553
expect_failure = True,
547554
)

‎test/xcode_support_test.bzl‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,8 @@
1313
# limitations under the License.
1414
"""Definition of a test rule to test xcode_support."""
1515

16-
load(
17-
"//lib:apple_support.bzl",
18-
"apple_support",
19-
)
20-
load(
21-
"//lib:xcode_support.bzl",
22-
"xcode_support",
23-
)
16+
load("//lib:apple_support.bzl", "apple_support")
17+
load("//lib:xcode_support.bzl", "xcode_support")
2418

2519
# Template for the test script used to validate that the action outputs contain the expected
2620
# values.

‎test/xcode_version_test.bzl‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,7 @@
1515
"""Tests for the `xcode_version` rule."""
1616

1717
load("@bazel_skylib//lib:unittest.bzl", "analysistest", "asserts")
18-
load(
19-
"@build_bazel_apple_support//xcode:xcode_version.bzl",
20-
"xcode_version",
21-
)
18+
load("//xcode:xcode_version.bzl", "xcode_version")
2219
load(":test_helpers.bzl", "FIXTURE_TAGS", "make_all_tests")
2320

2421
visibility("private")

0 commit comments

Comments
 (0)