From f9a379157d1e992390c5b6f0b75ef853e0870689 Mon Sep 17 00:00:00 2001 From: lberki Date: Thu, 19 Oct 2017 10:12:38 +0200 Subject: Remove OS/Xcode versions (and thus package loading) from AppleConfiguration.Loader. Fixes #3424. RELNOTES[INC]: Selecting on "xcode_version" and "{ios,tvos,macos,watchos}_sdk_version" is not supported anymore. What was config_setting(values={"$FOO_version": $VALUE}) is now config_setting(flag_values={"@bazel_tools//tools/osx:$FOO_version_flag": $VALUE}). PiperOrigin-RevId: 172714477 --- .../devtools/build/lib/analysis/BuildViewTest.java | 17 ----------------- .../apple/AppleConfigurationSerializationTest.java | 17 +++-------------- 2 files changed, 3 insertions(+), 31 deletions(-) (limited to 'src/test/java/com/google') diff --git a/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java b/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java index ae217d3b54..b0a5585470 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java @@ -1107,23 +1107,6 @@ public class BuildViewTest extends BuildViewTestBase { } } - @Test - public void testMissingXcodeVersion() throws Exception { - // The xcode_version flag uses yet another code path on top of the redirect chaser. - // Note that the redirect chaser throws if it can't find a package, but doesn't throw if it - // can't find a label in a package - that's why we use an empty package here. - scratch.file("xcode/BUILD"); - useConfiguration("--xcode_version=1.2", "--xcode_version_config=//xcode:does_not_exist"); - reporter.removeHandler(failFastHandler); - try { - update(defaultFlags().with(Flag.KEEP_GOING)); - fail(); - } catch (InvalidConfigurationException e) { - assertThat(e).hasMessageThat().contains("//xcode:does_not_exist"); - } - } - - @Test public void testVisibilityReferencesNonexistentPackage() throws Exception { scratch.file("z/a/BUILD", diff --git a/src/test/java/com/google/devtools/build/lib/rules/apple/AppleConfigurationSerializationTest.java b/src/test/java/com/google/devtools/build/lib/rules/apple/AppleConfigurationSerializationTest.java index 79d566af0e..27d8987166 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/apple/AppleConfigurationSerializationTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/apple/AppleConfigurationSerializationTest.java @@ -16,7 +16,6 @@ package com.google.devtools.build.lib.rules.apple; import com.google.common.collect.ImmutableList; import com.google.devtools.build.lib.analysis.config.BuildOptions; -import com.google.devtools.build.lib.analysis.config.InvalidConfigurationException; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec; import com.google.devtools.build.lib.skyframe.serialization.SerializationException; @@ -88,23 +87,13 @@ public class AppleConfigurationSerializationTest return new AppleConfiguration[] { new AppleConfiguration( firstOptions, - "iosCpuArg", - DottedVersion.fromString("10.0"), - DottedVersion.fromString("11.0"), - DottedVersion.fromString("12.0"), - DottedVersion.fromString("13.0"), - DottedVersion.fromString("14.0"), - DottedVersion.fromString("15.0"), - DottedVersion.fromString("16.0"), - DottedVersion.fromString("17.0"), - DottedVersion.fromString("18.0")), + "iosCpuArg"), AppleConfiguration.create( BuildOptions.of(ImmutableList.of(AppleCommandLineOptions.class)) .get(AppleCommandLineOptions.class), - "another cpu", - XcodeVersionProperties.unknownXcodeVersionProperties()) + "another cpu") }; - } catch (InvalidConfigurationException | OptionsParsingException e) { + } catch (OptionsParsingException e) { throw new IllegalStateException(e); } } -- cgit v1.2.3