diff options
author | 2018-04-20 06:45:24 -0700 | |
---|---|---|
committer | 2018-04-20 06:47:04 -0700 | |
commit | 32f607fcada801e5b5ce4d4d0809f23c44495213 (patch) | |
tree | 60f15a15428328facc6e525d11091f687e90b1f5 /src/test/java/com | |
parent | 1fafc6fd3ac87d2963d08a6b7ddd076edfa2fb94 (diff) |
Make action_config.tools include crosstool top path by default
We always prepend crosstool top path anyway, so let's create Tool instances with
the already prepared path.
I don't expect this affects memory usage since we don't have many cc_toolchain
targets in the graph.
RELNOTES: None
PiperOrigin-RevId: 193660445
Diffstat (limited to 'src/test/java/com')
3 files changed, 13 insertions, 37 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainFeaturesTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainFeaturesTest.java index 5cdc60419b..82f4e743a2 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainFeaturesTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainFeaturesTest.java @@ -93,7 +93,8 @@ public class CcToolchainFeaturesTest extends FoundationTestCase { public static CcToolchainFeatures buildFeatures(String... toolchain) throws Exception { CToolchain.Builder toolchainBuilder = CToolchain.newBuilder(); TextFormat.merge(Joiner.on("").join(toolchain), toolchainBuilder); - return new CcToolchainFeatures(toolchainBuilder.buildPartial()); + return new CcToolchainFeatures( + toolchainBuilder.buildPartial(), PathFragment.create("crosstool/")); } private Set<String> getEnabledFeatures(CcToolchainFeatures features, @@ -1424,8 +1425,7 @@ public class CcToolchainFeaturesTest extends FoundationTestCase { " implies: 'action-a'", "}") .getFeatureConfiguration(ImmutableSet.of("activates-action-a")); - PathFragment crosstoolPath = PathFragment.create("crosstool/"); - PathFragment toolPath = configuration.getToolForAction("action-a").getToolPath(crosstoolPath); + PathFragment toolPath = configuration.getToolForAction("action-a").getToolPathFragment(); assertThat(toolPath.toString()).isEqualTo("crosstool/toolchain/a"); } @@ -1473,65 +1473,42 @@ public class CcToolchainFeaturesTest extends FoundationTestCase { " implies: 'action-a'", "}"); - PathFragment crosstoolPath = PathFragment.create("crosstool/"); - FeatureConfiguration featureAConfiguration = toolchainFeatures.getFeatureConfiguration( ImmutableSet.of("feature-a", "activates-action-a")); - assertThat( - featureAConfiguration - .getToolForAction("action-a") - .getToolPath(crosstoolPath) - .toString()) + assertThat(featureAConfiguration.getToolForAction("action-a").getToolPathFragment().toString()) .isEqualTo("crosstool/toolchain/feature-a-and-not-c"); FeatureConfiguration featureAAndCConfiguration = toolchainFeatures.getFeatureConfiguration( ImmutableSet.of("feature-a", "feature-c", "activates-action-a")); assertThat( - featureAAndCConfiguration - .getToolForAction("action-a") - .getToolPath(crosstoolPath) - .toString()) + featureAAndCConfiguration.getToolForAction("action-a").getToolPathFragment().toString()) .isEqualTo("crosstool/toolchain/feature-b-or-c"); FeatureConfiguration featureBConfiguration = toolchainFeatures.getFeatureConfiguration( ImmutableSet.of("feature-b", "activates-action-a")); - assertThat( - featureBConfiguration - .getToolForAction("action-a") - .getToolPath(crosstoolPath) - .toString()) + assertThat(featureBConfiguration.getToolForAction("action-a").getToolPathFragment().toString()) .isEqualTo("crosstool/toolchain/feature-b-or-c"); FeatureConfiguration featureCConfiguration = toolchainFeatures.getFeatureConfiguration( ImmutableSet.of("feature-c", "activates-action-a")); - assertThat( - featureCConfiguration - .getToolForAction("action-a") - .getToolPath(crosstoolPath) - .toString()) + assertThat(featureCConfiguration.getToolForAction("action-a").getToolPathFragment().toString()) .isEqualTo("crosstool/toolchain/feature-b-or-c"); FeatureConfiguration featureAAndBConfiguration = toolchainFeatures.getFeatureConfiguration( ImmutableSet.of("feature-a", "feature-b", "activates-action-a")); assertThat( - featureAAndBConfiguration - .getToolForAction("action-a") - .getToolPath(crosstoolPath) - .toString()) + featureAAndBConfiguration.getToolForAction("action-a").getToolPathFragment().toString()) .isEqualTo("crosstool/toolchain/features-a-and-b"); FeatureConfiguration noFeaturesConfiguration = toolchainFeatures.getFeatureConfiguration(ImmutableSet.of("activates-action-a")); assertThat( - noFeaturesConfiguration - .getToolForAction("action-a") - .getToolPath(crosstoolPath) - .toString()) + noFeaturesConfiguration.getToolForAction("action-a").getToolPathFragment().toString()) .isEqualTo("crosstool/toolchain/default"); } @@ -1555,13 +1532,11 @@ public class CcToolchainFeaturesTest extends FoundationTestCase { " implies: 'action-a'", "}"); - PathFragment crosstoolPath = PathFragment.create("crosstool/"); - FeatureConfiguration noFeaturesConfiguration = toolchainFeatures.getFeatureConfiguration(ImmutableSet.of("activates-action-a")); try { - noFeaturesConfiguration.getToolForAction("action-a").getToolPath(crosstoolPath); + noFeaturesConfiguration.getToolForAction("action-a").getToolPathFragment(); fail("Expected IllegalArgumentException"); } catch (IllegalArgumentException e) { assertThat(e) diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CompileCommandLineTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CompileCommandLineTest.java index 7622fb3f03..c57c82442c 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CompileCommandLineTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CompileCommandLineTest.java @@ -141,7 +141,6 @@ public class CompileCommandLineTest extends BuildViewTestCase { scratchArtifact("a/FakeInput"), CoptsFilter.alwaysPasses(), "c++-compile", - getTargetConfiguration().getFragment(CppConfiguration.class).getCrosstoolTopPathFragment(), new DotdFile(scratchArtifact("a/dotD"))); } } diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/LinkBuildVariablesTestCase.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/LinkBuildVariablesTestCase.java index a6041401c9..3eab78dd15 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/cpp/LinkBuildVariablesTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/LinkBuildVariablesTestCase.java @@ -22,6 +22,7 @@ import com.google.devtools.build.lib.analysis.ConfiguredTarget; import com.google.devtools.build.lib.analysis.util.BuildViewTestCase; import com.google.devtools.build.lib.rules.cpp.CcToolchainFeatures.FeatureConfiguration; import com.google.devtools.build.lib.rules.cpp.CcToolchainFeatures.Variables; +import com.google.devtools.build.lib.vfs.PathFragment; import com.google.devtools.build.lib.view.config.crosstool.CrosstoolConfig.CToolchain; import com.google.protobuf.TextFormat; import java.util.List; @@ -70,7 +71,8 @@ public class LinkBuildVariablesTestCase extends BuildViewTestCase { public static CcToolchainFeatures buildFeatures(String... toolchain) throws Exception { CToolchain.Builder toolchainBuilder = CToolchain.newBuilder(); TextFormat.merge(Joiner.on("").join(toolchain), toolchainBuilder); - return new CcToolchainFeatures(toolchainBuilder.buildPartial()); + return new CcToolchainFeatures( + toolchainBuilder.buildPartial(), /* crosstoolTop= */ PathFragment.EMPTY_FRAGMENT); } /** Returns the value of a given sequence variable in context of the given Variables instance. */ |