diff options
author | bbaren <bbaren@google.com> | 2018-08-15 13:58:00 -0700 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-08-15 13:59:26 -0700 |
commit | c5442570ecba9a540a552825c8aed7ac9c62c321 (patch) | |
tree | c5d3eb1b56ab2b8faa444d130361149c2537ac92 /src/test/java/com/google/devtools/build/lib/packages/util/MockObjcSupport.java | |
parent | e2f61b197a1375b04222aa99a6bbcb290a19e36c (diff) |
When setting the standard Xcode version feature (see
commit eb952d08f76afa907bb34eaf7e1a69899102c523), always use exactly two
components for the version number. Grouping all point releases together
simplifies writing CROSSTOOLs.
Also fix a bug in MockObjcSupport that prevented Xcode version selection
in tests from working properly.
RELNOTES:
The standard `xcode_VERSION` feature now always uses exactly two
components in the version, even if you specify `--xcode_version` with
more or fewer than two.
PiperOrigin-RevId: 208877588
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/packages/util/MockObjcSupport.java')
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/packages/util/MockObjcSupport.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/packages/util/MockObjcSupport.java b/src/test/java/com/google/devtools/build/lib/packages/util/MockObjcSupport.java index 3b10f41561..b9e7ce034a 100644 --- a/src/test/java/com/google/devtools/build/lib/packages/util/MockObjcSupport.java +++ b/src/test/java/com/google/devtools/build/lib/packages/util/MockObjcSupport.java @@ -116,7 +116,7 @@ public final class MockObjcSupport { ")", "xcode_config(name = 'host_xcodes',", " default = ':version7_3_1',", - " versions = [':version7_3_1', 'version5_0', 'version7_3', 'version5_8'])", + " versions = [':version7_3_1', ':version5_0', ':version7_3', ':version5_8', ':version5'])", "xcode_version(", " name = 'version7_3_1',", " version = '" + DEFAULT_XCODE_VERSION + "',", @@ -134,6 +134,10 @@ public final class MockObjcSupport { " name = 'version5_8',", " version = '5.8',", ")", + "xcode_version(", + " name = 'version5',", + " version = '5',", + ")", "objc_library(name = 'dummy_lib', srcs = ['objc_dummy.mm'])", "alias(name = 'protobuf_lib', actual = '//objcproto:protobuf_lib')"); // If the bazel tools repository is not in the workspace, also create a workspace tools/objc |