Skip to content

Commit 91e9564

Browse files
hvadehracopybara-github
authored andcommitted
Delete a redundant method
PiperOrigin-RevId: 792537906 Change-Id: Ifb0346c2bc9955796f9c74cca1ab881788105919
1 parent 2a5f1d0 commit 91e9564

File tree

2 files changed

+3
-21
lines changed

2 files changed

+3
-21
lines changed

src/test/java/com/google/devtools/build/lib/rules/cpp/BUILD

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,16 +50,14 @@ java_library(
5050
"LinkBuildVariablesTestCase.java",
5151
],
5252
deps = [
53+
":CcToolchainTestHelper",
5354
"//src/main/java/com/google/devtools/build/lib/actions:artifacts",
5455
"//src/main/java/com/google/devtools/build/lib/analysis:analysis_cluster",
5556
"//src/main/java/com/google/devtools/build/lib/analysis:configured_target",
5657
"//src/main/java/com/google/devtools/build/lib/rules/cpp",
57-
"//src/main/java/com/google/devtools/build/lib/vfs:pathfragment",
58-
"//src/main/protobuf:crosstool_config_java_proto",
5958
"//src/test/java/com/google/devtools/build/lib/analysis/util",
6059
"//third_party:guava",
6160
"//third_party:truth",
62-
"@com_google_protobuf//:protobuf_java",
6361
],
6462
)
6563

src/test/java/com/google/devtools/build/lib/rules/cpp/LinkBuildVariablesTestCase.java

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
import static com.google.common.truth.Truth.assertThat;
1818

19-
import com.google.common.base.Joiner;
2019
import com.google.common.collect.ImmutableSet;
2120
import com.google.common.collect.Iterables;
2221
import com.google.devtools.build.lib.actions.Artifact;
@@ -25,9 +24,6 @@
2524
import com.google.devtools.build.lib.analysis.actions.SpawnAction;
2625
import com.google.devtools.build.lib.analysis.util.BuildViewTestCase;
2726
import com.google.devtools.build.lib.rules.cpp.CcToolchainFeatures.FeatureConfiguration;
28-
import com.google.devtools.build.lib.vfs.PathFragment;
29-
import com.google.devtools.build.lib.view.config.crosstool.CrosstoolConfig.CToolchain;
30-
import com.google.protobuf.TextFormat;
3127
import java.util.List;
3228

3329
/**
@@ -119,22 +115,11 @@ protected CcToolchainVariables getLinkBuildVariables(
119115
return getLinkCommandLine(getCppLinkAction(target, type)).getBuildVariables();
120116
}
121117

122-
/** Creates a CcToolchainFeatures from features described in the given toolchain fragment. */
123-
public static CcToolchainFeatures buildFeatures(RuleContext ruleContext, String... toolchain)
124-
throws Exception {
125-
CToolchain.Builder toolchainBuilder = CToolchain.newBuilder();
126-
TextFormat.merge(Joiner.on("").join(toolchain), toolchainBuilder);
127-
return new CcToolchainFeatures(
128-
CcToolchainConfigInfo.fromToolchainForTestingOnly(toolchainBuilder.buildPartial()),
129-
/* ccToolchainPath= */ PathFragment.EMPTY_FRAGMENT);
130-
}
131-
132118
/** Returns the value of a given sequence variable in context of the given Variables instance. */
133119
protected static List<String> getSequenceVariableValue(
134120
RuleContext ruleContext, CcToolchainVariables variables, String variable) throws Exception {
135121
FeatureConfiguration mockFeatureConfiguration =
136-
buildFeatures(
137-
ruleContext,
122+
CcToolchainTestHelper.buildFeatures(
138123
"feature {",
139124
" name: 'a'",
140125
" flag_set {",
@@ -153,8 +138,7 @@ protected static List<String> getSequenceVariableValue(
153138
protected static String getVariableValue(
154139
RuleContext ruleContext, CcToolchainVariables variables, String variable) throws Exception {
155140
FeatureConfiguration mockFeatureConfiguration =
156-
buildFeatures(
157-
ruleContext,
141+
CcToolchainTestHelper.buildFeatures(
158142
"feature {",
159143
" name: 'a'",
160144
" flag_set {",

0 commit comments

Comments
 (0)