diff options
Diffstat (limited to 'src/test/java/com/google/devtools')
7 files changed, 92 insertions, 82 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 82f4e743a2..6c04b605eb 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 @@ -30,14 +30,13 @@ import com.google.devtools.build.lib.analysis.config.InvalidConfigurationExcepti import com.google.devtools.build.lib.rules.cpp.CcToolchainFeatures.ActionConfig; import com.google.devtools.build.lib.rules.cpp.CcToolchainFeatures.ExpansionException; 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.rules.cpp.CcToolchainFeatures.Variables.IntegerValue; -import com.google.devtools.build.lib.rules.cpp.CcToolchainFeatures.Variables.LibraryToLinkValue; -import com.google.devtools.build.lib.rules.cpp.CcToolchainFeatures.Variables.SequenceBuilder; -import com.google.devtools.build.lib.rules.cpp.CcToolchainFeatures.Variables.StringSequenceBuilder; -import com.google.devtools.build.lib.rules.cpp.CcToolchainFeatures.Variables.StructureBuilder; -import com.google.devtools.build.lib.rules.cpp.CcToolchainFeatures.Variables.VariableValue; -import com.google.devtools.build.lib.rules.cpp.CcToolchainFeatures.Variables.VariableValueBuilder; +import com.google.devtools.build.lib.rules.cpp.CcToolchainVariables.IntegerValue; +import com.google.devtools.build.lib.rules.cpp.CcToolchainVariables.LibraryToLinkValue; +import com.google.devtools.build.lib.rules.cpp.CcToolchainVariables.SequenceBuilder; +import com.google.devtools.build.lib.rules.cpp.CcToolchainVariables.StringSequenceBuilder; +import com.google.devtools.build.lib.rules.cpp.CcToolchainVariables.StructureBuilder; +import com.google.devtools.build.lib.rules.cpp.CcToolchainVariables.VariableValue; +import com.google.devtools.build.lib.rules.cpp.CcToolchainVariables.VariableValueBuilder; import com.google.devtools.build.lib.skyframe.serialization.AutoRegistry; import com.google.devtools.build.lib.skyframe.serialization.ObjectCodecs; import com.google.devtools.build.lib.skyframe.serialization.testutils.SerializationTester; @@ -66,7 +65,7 @@ public class CcToolchainFeaturesTest extends FoundationTestCase { * <p>If there are multiple entries with the same key, the variable will be treated as sequence * type. */ - private Variables createVariables(String... entries) { + private CcToolchainVariables createVariables(String... entries) { if (entries.length % 2 != 0) { throw new IllegalArgumentException( "createVariables takes an even number of arguments (key/value pairs)"); @@ -75,7 +74,7 @@ public class CcToolchainFeaturesTest extends FoundationTestCase { for (int i = 0; i < entries.length; i += 2) { entryMap.put(entries[i], entries[i + 1]); } - Variables.Builder variables = new Variables.Builder(); + CcToolchainVariables.Builder variables = new CcToolchainVariables.Builder(); for (String name : entryMap.keySet()) { Collection<String> value = entryMap.get(name); if (value.size() == 1) { @@ -302,7 +301,11 @@ public class CcToolchainFeaturesTest extends FoundationTestCase { return getExpansionOfFlag(value, createVariables()); } - private List<String> getCommandLineForFlagGroups(String groups, Variables variables) + private String getExpansionOfFlag(String value, CcToolchainVariables variables) throws Exception { + return getCommandLineForFlag(value, variables).get(0); + } + + private List<String> getCommandLineForFlagGroups(String groups, CcToolchainVariables variables) throws Exception { FeatureConfiguration configuration = buildFeatures( @@ -317,14 +320,11 @@ public class CcToolchainFeaturesTest extends FoundationTestCase { return configuration.getCommandLine(CppCompileAction.CPP_COMPILE, variables); } - private List<String> getCommandLineForFlag(String value, Variables variables) throws Exception { + private List<String> getCommandLineForFlag(String value, CcToolchainVariables variables) + throws Exception { return getCommandLineForFlagGroups("flag_group { flag: '" + value + "' }", variables); } - private String getExpansionOfFlag(String value, Variables variables) throws Exception { - return getCommandLineForFlag(value, variables).get(0); - } - private String getFlagParsingError(String value) throws Exception { try { getExpansionOfFlag(value); @@ -335,7 +335,8 @@ public class CcToolchainFeaturesTest extends FoundationTestCase { } } - private String getFlagExpansionError(String value, Variables variables) throws Exception { + private String getFlagExpansionError(String value, CcToolchainVariables variables) + throws Exception { try { getExpansionOfFlag(value, variables); fail("Expected ExpansionException"); @@ -345,7 +346,7 @@ public class CcToolchainFeaturesTest extends FoundationTestCase { } } - private String getFlagGroupsExpansionError(String flagGroups, Variables variables) + private String getFlagGroupsExpansionError(String flagGroups, CcToolchainVariables variables) throws Exception { try { getCommandLineForFlagGroups(flagGroups, variables).get(0); @@ -371,7 +372,7 @@ public class CcToolchainFeaturesTest extends FoundationTestCase { assertThat( getCommandLineForFlagGroups( "flag_group{ iterate_over: 'v' flag: '%{v}' }", - new Variables.Builder() + new CcToolchainVariables.Builder() .addStringSequenceVariable("v", ImmutableList.<String>of()) .build())) .isEmpty(); @@ -384,23 +385,24 @@ public class CcToolchainFeaturesTest extends FoundationTestCase { assertThat( getCommandLineForFlagGroups( "flag_group { iterate_over: 'lazy' flag: '-lazy-%{lazy}' }", - new Variables.Builder() + new CcToolchainVariables.Builder() .addLazyStringSequenceVariable("lazy", () -> ImmutableList.of("a", "b", "c")) .build())) .containsExactly("-lazy-a", "-lazy-b", "-lazy-c") .inOrder(); } - private Variables createStructureSequenceVariables(String name, StructureBuilder... values) { + private CcToolchainVariables createStructureSequenceVariables( + String name, StructureBuilder... values) { SequenceBuilder builder = new SequenceBuilder(); for (StructureBuilder value : values) { builder.addValue(value.build()); } - return new Variables.Builder().addCustomBuiltVariable(name, builder).build(); + return new CcToolchainVariables.Builder().addCustomBuiltVariable(name, builder).build(); } - private Variables createStructureVariables(String name, StructureBuilder value) { - return new Variables.Builder().addCustomBuiltVariable(name, value).build(); + private CcToolchainVariables createStructureVariables(String name, StructureBuilder value) { + return new CcToolchainVariables.Builder().addCustomBuiltVariable(name, value).build(); } @Test @@ -521,7 +523,7 @@ public class CcToolchainFeaturesTest extends FoundationTestCase { + " }" + " }" + "}", - new Variables.Builder() + new CcToolchainVariables.Builder() .addCustomBuiltVariable( "struct", new StructureBuilder() @@ -542,7 +544,7 @@ public class CcToolchainFeaturesTest extends FoundationTestCase { + "}", createStructureVariables( "struct", - new Variables.StructureBuilder() + new CcToolchainVariables.StructureBuilder() .addField("foo", "fooValue") .addField("bar", "barValue")))) .containsExactly("-AfooValue", "-BbarValue"); @@ -559,7 +561,7 @@ public class CcToolchainFeaturesTest extends FoundationTestCase { + "}", createStructureVariables( "struct", - new Variables.StructureBuilder() + new CcToolchainVariables.StructureBuilder() .addField("foo", "fooValue") .addField("bar", "barValue")))) .isEmpty(); @@ -602,7 +604,7 @@ public class CcToolchainFeaturesTest extends FoundationTestCase { + "}", createStructureVariables( "struct", - new Variables.StructureBuilder() + new CcToolchainVariables.StructureBuilder() .addField("foo", "fooValue") .addField("bar", "barValue")))) .containsExactly("-AfooValue", "-BbarValue"); @@ -618,7 +620,8 @@ public class CcToolchainFeaturesTest extends FoundationTestCase { + " flag: '-B%{struct.bar}'" + "}", createStructureVariables( - "struct", new Variables.StructureBuilder().addField("bar", "barValue")))) + "struct", + new CcToolchainVariables.StructureBuilder().addField("bar", "barValue")))) .isEmpty(); } @@ -636,7 +639,8 @@ public class CcToolchainFeaturesTest extends FoundationTestCase { + " }" + "}", createStructureVariables( - "struct", new Variables.StructureBuilder().addField("bar", "barValue")))) + "struct", + new CcToolchainVariables.StructureBuilder().addField("bar", "barValue")))) .containsExactly("-BbarValue"); } @@ -705,7 +709,7 @@ public class CcToolchainFeaturesTest extends FoundationTestCase { + "}", createStructureVariables( "struct", - new Variables.StructureBuilder() + new CcToolchainVariables.StructureBuilder() .addField("bool", new IntegerValue(1)) .addField("foo", "fooValue") .addField("bar", "barValue")))) @@ -728,7 +732,7 @@ public class CcToolchainFeaturesTest extends FoundationTestCase { + "}", createStructureVariables( "struct", - new Variables.StructureBuilder() + new CcToolchainVariables.StructureBuilder() .addField("bool", new IntegerValue(0)) .addField("foo", "fooValue") .addField("bar", "barValue")))) @@ -841,8 +845,8 @@ public class CcToolchainFeaturesTest extends FoundationTestCase { } } - private Variables createNestedVariables(String name, int depth, int count) { - return new Variables.Builder() + private CcToolchainVariables createNestedVariables(String name, int depth, int count) { + return new CcToolchainVariables.Builder() .addCustomBuiltVariable(name, createNestedSequence(depth, count, "")) .build(); } diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainProviderTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainProviderTest.java index d039539178..6835970d46 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainProviderTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainProviderTest.java @@ -20,7 +20,6 @@ import com.google.common.testing.EqualsTester; import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder; import com.google.devtools.build.lib.collect.nestedset.Order; -import com.google.devtools.build.lib.rules.cpp.CcToolchainFeatures.Variables; import com.google.devtools.build.lib.rules.cpp.FdoSupport.FdoMode; import com.google.devtools.build.lib.vfs.PathFragment; import org.junit.Test; @@ -60,7 +59,7 @@ public class CcToolchainProviderTest { CcCompilationContext.EMPTY, /* supportsParamFiles= */ false, /* supportsHeaderParsing= */ false, - Variables.EMPTY, + CcToolchainVariables.EMPTY, /* builtinIncludeFiles= */ ImmutableList.<Artifact>of(), /* coverageEnvironment= */ NestedSetBuilder.emptySet(Order.COMPILE_ORDER), /* linkDynamicLibraryTool= */ null, @@ -97,7 +96,7 @@ public class CcToolchainProviderTest { CcCompilationContext.EMPTY, /* supportsParamFiles= */ false, /* supportsHeaderParsing= */ false, - Variables.EMPTY, + CcToolchainVariables.EMPTY, /* builtinIncludeFiles= */ ImmutableList.<Artifact>of(), /* coverageEnvironment= */ NestedSetBuilder.emptySet(Order.COMPILE_ORDER), /* linkDynamicLibraryTool= */ null, diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CompileBuildVariablesTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CompileBuildVariablesTest.java index 2714ef51c9..0e6caeac2a 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CompileBuildVariablesTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CompileBuildVariablesTest.java @@ -22,7 +22,6 @@ import com.google.common.collect.Iterables; import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.analysis.util.AnalysisMock; import com.google.devtools.build.lib.analysis.util.BuildViewTestCase; -import com.google.devtools.build.lib.rules.cpp.CcToolchainFeatures.Variables; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; @@ -48,7 +47,8 @@ public class CompileBuildVariablesTest extends BuildViewTestCase { } /** Returns active build variables for a compile action of given type for given target. */ - protected Variables getCompileBuildVariables(String label, String name) throws Exception { + protected CcToolchainVariables getCompileBuildVariables(String label, String name) + throws Exception { return getCppCompileAction(label, name).getCompileCommandLine().getVariables(); } @@ -57,7 +57,7 @@ public class CompileBuildVariablesTest extends BuildViewTestCase { scratch.file("x/BUILD", "cc_binary(name = 'bin', srcs = ['bin.cc'])"); scratch.file("x/bin.cc"); - Variables variables = getCompileBuildVariables("//x:bin", "bin"); + CcToolchainVariables variables = getCompileBuildVariables("//x:bin", "bin"); assertThat(variables.getStringVariable(CompileBuildVariables.SOURCE_FILE.getVariableName())) .contains("x/bin.cc"); @@ -73,10 +73,10 @@ public class CompileBuildVariablesTest extends BuildViewTestCase { scratch.file("x/BUILD", "cc_binary(name = 'bin', srcs = ['bin.cc'])"); scratch.file("x/bin.cc"); - Variables variables = getCompileBuildVariables("//x:bin", "bin"); + CcToolchainVariables variables = getCompileBuildVariables("//x:bin", "bin"); ImmutableList<String> copts = - Variables.toStringList( + CcToolchainVariables.toStringList( variables, CompileBuildVariables.LEGACY_COMPILE_FLAGS.getVariableName()); assertThat(copts).contains("-foo"); } @@ -89,15 +89,15 @@ public class CompileBuildVariablesTest extends BuildViewTestCase { scratch.file("x/BUILD", "cc_binary(name = 'bin', srcs = ['bin.cc'], copts = ['-bar'],)"); scratch.file("x/bin.cc"); - Variables variables = getCompileBuildVariables("//x:bin", "bin"); + CcToolchainVariables variables = getCompileBuildVariables("//x:bin", "bin"); ImmutableList<String> userCopts = - Variables.toStringList( + CcToolchainVariables.toStringList( variables, CompileBuildVariables.USER_COMPILE_FLAGS.getVariableName()); assertThat(userCopts).containsAllIn(ImmutableList.<String>of("-foo", "-bar")).inOrder(); ImmutableList<String> legacyCopts = - Variables.toStringList( + CcToolchainVariables.toStringList( variables, CompileBuildVariables.LEGACY_COMPILE_FLAGS.getVariableName()); assertThat(legacyCopts).doesNotContain("-foo"); } @@ -110,10 +110,10 @@ public class CompileBuildVariablesTest extends BuildViewTestCase { scratch.file("x/BUILD", "cc_binary(name = 'bin', srcs = ['bin.cc'], copts = ['-foo'])"); scratch.file("x/bin.cc"); - Variables variables = getCompileBuildVariables("//x:bin", "bin"); + CcToolchainVariables variables = getCompileBuildVariables("//x:bin", "bin"); ImmutableList<String> copts = - Variables.toStringList( + CcToolchainVariables.toStringList( variables, CompileBuildVariables.USER_COMPILE_FLAGS.getVariableName()); assertThat(copts).contains("-foo"); } @@ -128,10 +128,10 @@ public class CompileBuildVariablesTest extends BuildViewTestCase { scratch.file("x/BUILD", "cc_binary(name = 'bin', srcs = ['bin.cc'])"); scratch.file("x/bin.cc"); - Variables variables = getCompileBuildVariables("//x:bin", "bin"); + CcToolchainVariables variables = getCompileBuildVariables("//x:bin", "bin"); ImmutableList<String> unfilteredCompileFlags = - Variables.toStringList( + CcToolchainVariables.toStringList( variables, CompileBuildVariables.UNFILTERED_COMPILE_FLAGS.getVariableName()); assertThat(unfilteredCompileFlags).contains("--i_ll_live_forever"); } @@ -142,10 +142,10 @@ public class CompileBuildVariablesTest extends BuildViewTestCase { scratch.file("x/bin.cc"); useConfiguration("--per_file_copt=//x:bin@-foo", "--per_file_copt=//x:bar\\.cc@-bar"); - Variables variables = getCompileBuildVariables("//x:bin", "bin"); + CcToolchainVariables variables = getCompileBuildVariables("//x:bin", "bin"); ImmutableList<String> copts = - Variables.toStringList( + CcToolchainVariables.toStringList( variables, CompileBuildVariables.USER_COMPILE_FLAGS.getVariableName()); assertThat(copts).containsExactly("-foo").inOrder(); } @@ -160,7 +160,7 @@ public class CompileBuildVariablesTest extends BuildViewTestCase { scratch.file("x/BUILD", "cc_binary(name = 'bin', srcs = ['bin.cc'])"); scratch.file("x/bin.cc"); - Variables variables = getCompileBuildVariables("//x:bin", "bin"); + CcToolchainVariables variables = getCompileBuildVariables("//x:bin", "bin"); assertThat(variables.getStringVariable(CcCommon.SYSROOT_VARIABLE_NAME)) .isEqualTo("/usr/local/custom-sysroot"); diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java index 42673d9fa5..8aaefcc460 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java @@ -46,7 +46,7 @@ import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder; import com.google.devtools.build.lib.collect.nestedset.Order; import com.google.devtools.build.lib.packages.util.MockCcSupport; import com.google.devtools.build.lib.rules.cpp.CcToolchainFeatures.FeatureConfiguration; -import com.google.devtools.build.lib.rules.cpp.CcToolchainFeatures.Variables.VariableValue; +import com.google.devtools.build.lib.rules.cpp.CcToolchainVariables.VariableValue; import com.google.devtools.build.lib.rules.cpp.CppActionConfigs.CppPlatform; import com.google.devtools.build.lib.rules.cpp.Link.LinkTargetType; import com.google.devtools.build.lib.rules.cpp.Link.LinkerOrArchiver; diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/LinkBuildVariablesTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/LinkBuildVariablesTest.java index 1eed5db619..bc463b09ab 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/cpp/LinkBuildVariablesTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/LinkBuildVariablesTest.java @@ -22,9 +22,8 @@ import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.analysis.ConfiguredTarget; import com.google.devtools.build.lib.analysis.util.AnalysisMock; import com.google.devtools.build.lib.packages.util.MockCcSupport; -import com.google.devtools.build.lib.rules.cpp.CcToolchainFeatures.Variables; -import com.google.devtools.build.lib.rules.cpp.CcToolchainFeatures.Variables.LibraryToLinkValue; -import com.google.devtools.build.lib.rules.cpp.CcToolchainFeatures.Variables.VariableValue; +import com.google.devtools.build.lib.rules.cpp.CcToolchainVariables.LibraryToLinkValue; +import com.google.devtools.build.lib.rules.cpp.CcToolchainVariables.VariableValue; import com.google.devtools.build.lib.rules.cpp.Link.LinkTargetType; import com.google.devtools.build.lib.util.OsUtils; import java.util.List; @@ -43,7 +42,7 @@ public class LinkBuildVariablesTest extends LinkBuildVariablesTestCase { scratch.file("x/a.cc"); ConfiguredTarget target = getConfiguredTarget("//x:bin"); - Variables variables = getLinkBuildVariables(target, Link.LinkTargetType.EXECUTABLE); + CcToolchainVariables variables = getLinkBuildVariables(target, Link.LinkTargetType.EXECUTABLE); String variableValue = getVariableValue(variables, LinkBuildVariables.FORCE_PIC.getVariableName()); assertThat(variableValue).contains(""); @@ -58,7 +57,8 @@ public class LinkBuildVariablesTest extends LinkBuildVariablesTestCase { scratch.file("x/a.cc"); ConfiguredTarget target = getConfiguredTarget("//x:foo"); - Variables variables = getLinkBuildVariables(target, LinkTargetType.NODEPS_DYNAMIC_LIBRARY); + CcToolchainVariables variables = + getLinkBuildVariables(target, LinkTargetType.NODEPS_DYNAMIC_LIBRARY); VariableValue librariesToLinkSequence = variables.getVariable(LinkBuildVariables.LIBRARIES_TO_LINK.getVariableName()); assertThat(librariesToLinkSequence).isNotNull(); @@ -87,7 +87,7 @@ public class LinkBuildVariablesTest extends LinkBuildVariablesTestCase { scratch.file("x/some-dir/bar.so"); ConfiguredTarget target = getConfiguredTarget("//x:bin"); - Variables variables = getLinkBuildVariables(target, Link.LinkTargetType.EXECUTABLE); + CcToolchainVariables variables = getLinkBuildVariables(target, Link.LinkTargetType.EXECUTABLE); List<String> variableValue = getSequenceVariableValue( variables, LinkBuildVariables.LIBRARY_SEARCH_DIRECTORIES.getVariableName()); @@ -103,7 +103,7 @@ public class LinkBuildVariablesTest extends LinkBuildVariablesTestCase { scratch.file("x/some-dir/bar.so"); ConfiguredTarget target = getConfiguredTarget("//x:bin"); - Variables variables = getLinkBuildVariables(target, Link.LinkTargetType.EXECUTABLE); + CcToolchainVariables variables = getLinkBuildVariables(target, Link.LinkTargetType.EXECUTABLE); String variableValue = getVariableValue(variables, LinkBuildVariables.LINKER_PARAM_FILE.getVariableName()); assertThat(variableValue).matches(".*bin/x/bin" + OsUtils.executableExtension() + "-2.params$"); @@ -122,7 +122,8 @@ public class LinkBuildVariablesTest extends LinkBuildVariablesTestCase { scratch.file("x/a.cc"); ConfiguredTarget target = getConfiguredTarget("//x:foo"); - Variables variables = getLinkBuildVariables(target, LinkTargetType.NODEPS_DYNAMIC_LIBRARY); + CcToolchainVariables variables = + getLinkBuildVariables(target, LinkTargetType.NODEPS_DYNAMIC_LIBRARY); String interfaceLibraryBuilder = getVariableValue(variables, LinkBuildVariables.INTERFACE_LIBRARY_BUILDER.getVariableName()); @@ -170,7 +171,7 @@ public class LinkBuildVariablesTest extends LinkBuildVariablesTestCase { (CppLinkAction) getPredecessorByInputName( backendAction, "x/libfoo.so.lto/x/_objs/foo/x/a.pic.o.thinlto.bc"); - Variables variables = indexAction.getLinkCommandLine().getBuildVariables(); + CcToolchainVariables variables = indexAction.getLinkCommandLine().getBuildVariables(); String interfaceLibraryBuilder = getVariableValue(variables, LinkBuildVariables.INTERFACE_LIBRARY_BUILDER.getVariableName()); @@ -201,7 +202,7 @@ public class LinkBuildVariablesTest extends LinkBuildVariablesTestCase { scratch.file("x/a.cc"); ConfiguredTarget target = getConfiguredTarget("//x:foo"); - Variables variables = getLinkBuildVariables(target, LinkTargetType.STATIC_LIBRARY); + CcToolchainVariables variables = getLinkBuildVariables(target, LinkTargetType.STATIC_LIBRARY); String interfaceLibraryBuilder = getVariableValue(variables, LinkBuildVariables.INTERFACE_LIBRARY_BUILDER.getVariableName()); @@ -227,7 +228,8 @@ public class LinkBuildVariablesTest extends LinkBuildVariablesTestCase { scratch.file("x/a.cc"); ConfiguredTarget target = getConfiguredTarget("//x:foo"); - Variables variables = getLinkBuildVariables(target, LinkTargetType.NODEPS_DYNAMIC_LIBRARY); + CcToolchainVariables variables = + getLinkBuildVariables(target, LinkTargetType.NODEPS_DYNAMIC_LIBRARY); assertThat(getVariableValue(variables, LinkBuildVariables.OUTPUT_EXECPATH.getVariableName())) .endsWith("x/libfoo.so"); @@ -262,7 +264,7 @@ public class LinkBuildVariablesTest extends LinkBuildVariablesTestCase { (CppLinkAction) getPredecessorByInputName( backendAction, "x/libfoo.so.lto/x/_objs/foo/x/a.pic.o.thinlto.bc"); - Variables variables = indexAction.getLinkCommandLine().getBuildVariables(); + CcToolchainVariables variables = indexAction.getLinkCommandLine().getBuildVariables(); assertThat(variables.isAvailable(LinkBuildVariables.OUTPUT_EXECPATH.getVariableName())) .isFalse(); @@ -276,14 +278,16 @@ public class LinkBuildVariablesTest extends LinkBuildVariablesTestCase { scratch.file("x/a.cc"); ConfiguredTarget testTarget = getConfiguredTarget("//x:foo_test"); - Variables testVariables = getLinkBuildVariables(testTarget, LinkTargetType.EXECUTABLE); + CcToolchainVariables testVariables = + getLinkBuildVariables(testTarget, LinkTargetType.EXECUTABLE); assertThat( testVariables.getVariable(LinkBuildVariables.IS_CC_TEST.getVariableName()).isTruthy()) .isTrue(); ConfiguredTarget binaryTarget = getConfiguredTarget("//x:foo"); - Variables binaryVariables = getLinkBuildVariables(binaryTarget, LinkTargetType.EXECUTABLE); + CcToolchainVariables binaryVariables = + getLinkBuildVariables(binaryTarget, LinkTargetType.EXECUTABLE); assertThat( binaryVariables.getVariable(LinkBuildVariables.IS_CC_TEST.getVariableName()).isTruthy()) @@ -310,7 +314,7 @@ public class LinkBuildVariablesTest extends LinkBuildVariablesTestCase { String stripMode, String compilationMode, boolean isEnabled) throws Exception { useConfiguration("--strip=" + stripMode, "--compilation_mode=" + compilationMode); ConfiguredTarget target = getConfiguredTarget("//x:foo"); - Variables variables = getLinkBuildVariables(target, LinkTargetType.EXECUTABLE); + CcToolchainVariables variables = getLinkBuildVariables(target, LinkTargetType.EXECUTABLE); assertThat(variables.isAvailable(LinkBuildVariables.STRIP_DEBUG_SYMBOLS.getVariableName())) .isEqualTo(isEnabled); } @@ -327,13 +331,14 @@ public class LinkBuildVariablesTest extends LinkBuildVariablesTestCase { useConfiguration("--fission=no"); ConfiguredTarget target = getConfiguredTarget("//x:foo"); - Variables variables = getLinkBuildVariables(target, LinkTargetType.EXECUTABLE); + CcToolchainVariables variables = getLinkBuildVariables(target, LinkTargetType.EXECUTABLE); assertThat(variables.isAvailable(LinkBuildVariables.IS_USING_FISSION.getVariableName())) .isFalse(); useConfiguration("--fission=yes"); ConfiguredTarget fissionTarget = getConfiguredTarget("//x:foo"); - Variables fissionVariables = getLinkBuildVariables(fissionTarget, LinkTargetType.EXECUTABLE); + CcToolchainVariables fissionVariables = + getLinkBuildVariables(fissionTarget, LinkTargetType.EXECUTABLE); assertThat(fissionVariables.isAvailable(LinkBuildVariables.IS_USING_FISSION.getVariableName())) .isTrue(); } @@ -349,7 +354,8 @@ public class LinkBuildVariablesTest extends LinkBuildVariablesTestCase { scratch.file("x/a.cc"); ConfiguredTarget testTarget = getConfiguredTarget("//x:foo"); - Variables testVariables = getLinkBuildVariables(testTarget, LinkTargetType.EXECUTABLE); + CcToolchainVariables testVariables = + getLinkBuildVariables(testTarget, LinkTargetType.EXECUTABLE); assertThat(testVariables.isAvailable(CcCommon.SYSROOT_VARIABLE_NAME)).isTrue(); } 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 3eab78dd15..f2ba84608d 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 @@ -21,7 +21,6 @@ import com.google.devtools.build.lib.actions.Artifact; 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; @@ -61,7 +60,8 @@ public class LinkBuildVariablesTestCase extends BuildViewTestCase { } /** Returns active build variables for a link action of given type for given target. */ - protected Variables getLinkBuildVariables(ConfiguredTarget target, Link.LinkTargetType type) { + protected CcToolchainVariables getLinkBuildVariables( + ConfiguredTarget target, Link.LinkTargetType type) { return getCppLinkAction(target, type).getLinkCommandLine().getBuildVariables(); } @@ -76,7 +76,7 @@ public class LinkBuildVariablesTestCase extends BuildViewTestCase { } /** Returns the value of a given sequence variable in context of the given Variables instance. */ - protected List<String> getSequenceVariableValue(Variables variables, String variable) + protected List<String> getSequenceVariableValue(CcToolchainVariables variables, String variable) throws Exception { FeatureConfiguration mockFeatureConfiguration = buildFeatures( @@ -95,7 +95,8 @@ public class LinkBuildVariablesTestCase extends BuildViewTestCase { } /** Returns the value of a given string variable in context of the given Variables instance. */ - protected String getVariableValue(Variables variables, String variable) throws Exception { + protected String getVariableValue(CcToolchainVariables variables, String variable) + throws Exception { FeatureConfiguration mockFeatureConfiguration = buildFeatures( "feature {", diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcBuildVariablesTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcBuildVariablesTest.java index e49d6477fb..5d2eed5d9c 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcBuildVariablesTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcBuildVariablesTest.java @@ -26,7 +26,7 @@ import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.packages.util.MockObjcSupport; import com.google.devtools.build.lib.rules.apple.AppleCommandLineOptions; import com.google.devtools.build.lib.rules.apple.cpp.AppleCcToolchain; -import com.google.devtools.build.lib.rules.cpp.CcToolchainFeatures.Variables; +import com.google.devtools.build.lib.rules.cpp.CcToolchainVariables; import com.google.devtools.build.lib.rules.cpp.CppLinkAction; import com.google.devtools.build.lib.rules.cpp.Link; import com.google.devtools.build.lib.rules.cpp.LinkBuildVariablesTestCase; @@ -39,7 +39,7 @@ import org.junit.runners.JUnit4; /** * Tests that {@code CppLinkAction} is populated with the correct build variables for objective C * builds. - **/ + */ @RunWith(JUnit4.class) public class ObjcBuildVariablesTest extends LinkBuildVariablesTestCase { @@ -78,7 +78,7 @@ public class ObjcBuildVariablesTest extends LinkBuildVariablesTestCase { scratch.file("x/a.cc"); ConfiguredTarget target = getConfiguredTarget("//x:bin"); - Variables variables = getLinkBuildVariables(target, Link.LinkTargetType.EXECUTABLE); + CcToolchainVariables variables = getLinkBuildVariables(target, Link.LinkTargetType.EXECUTABLE); assertThat( getVariableValue(variables, AppleCcToolchain.XCODE_VERISON_OVERRIDE_VALUE_KEY)) .contains("5.8"); @@ -126,7 +126,7 @@ public class ObjcBuildVariablesTest extends LinkBuildVariablesTestCase { ActionsTestUtil.getFirstArtifactEndingWith(appleBinLinkAction.getInputs(), "liba.a"); CppLinkAction ccArchiveAction = (CppLinkAction) getGeneratingAction(archive); - Variables variables = ccArchiveAction.getLinkCommandLine().getBuildVariables(); + CcToolchainVariables variables = ccArchiveAction.getLinkCommandLine().getBuildVariables(); assertThat( getVariableValue(variables, AppleCcToolchain.XCODE_VERISON_OVERRIDE_VALUE_KEY)) .contains("5.8"); @@ -174,7 +174,7 @@ public class ObjcBuildVariablesTest extends LinkBuildVariablesTestCase { ActionsTestUtil.getFirstArtifactEndingWith(appleBinLinkAction.getInputs(), "liba.a"); CppLinkAction ccArchiveAction = (CppLinkAction) getGeneratingAction(archive); - Variables variables = ccArchiveAction.getLinkCommandLine().getBuildVariables(); + CcToolchainVariables variables = ccArchiveAction.getLinkCommandLine().getBuildVariables(); assertThat(getVariableValue(variables, AppleCcToolchain.VERSION_MIN_KEY)) .contains(dummyMinimumOsValue); } @@ -193,7 +193,7 @@ public class ObjcBuildVariablesTest extends LinkBuildVariablesTestCase { scratch.file("x/a.cc"); ConfiguredTarget target = getConfiguredTarget("//x:bin"); - Variables variables = getLinkBuildVariables(target, Link.LinkTargetType.EXECUTABLE); + CcToolchainVariables variables = getLinkBuildVariables(target, Link.LinkTargetType.EXECUTABLE); assertThat( getVariableValue(variables, AppleCcToolchain.XCODE_VERISON_OVERRIDE_VALUE_KEY)) .contains(MockObjcSupport.DEFAULT_XCODE_VERSION); @@ -239,7 +239,7 @@ public class ObjcBuildVariablesTest extends LinkBuildVariablesTestCase { ActionsTestUtil.getFirstArtifactEndingWith(appleBinLinkAction.getInputs(), "liba.a"); CppLinkAction ccArchiveAction = (CppLinkAction) getGeneratingAction(archive); - Variables variables = ccArchiveAction.getLinkCommandLine().getBuildVariables(); + CcToolchainVariables variables = ccArchiveAction.getLinkCommandLine().getBuildVariables(); assertThat(getVariableValue(variables, AppleCcToolchain.VERSION_MIN_KEY)) .contains(dummyMinimumOsValue); } |