Skip to content

Commit 4ae9562

Browse files
hvadehracopybara-github
authored andcommitted
Delete a redundant method
PiperOrigin-RevId: 792529880 Change-Id: I3cda5b3ab9b7b2dc8ce6a5d6d19120d3f9b8a4d0
1 parent a9e2a15 commit 4ae9562

File tree

1 file changed

+1
-13
lines changed

1 file changed

+1
-13
lines changed

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

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import static com.google.common.truth.Truth.assertThat;
1818
import static org.junit.Assert.assertThrows;
1919

20-
import com.google.common.base.Joiner;
2120
import com.google.common.base.Preconditions;
2221
import com.google.common.collect.ArrayListMultimap;
2322
import com.google.common.collect.ImmutableClassToInstanceMap;
@@ -40,10 +39,8 @@
4039
import com.google.devtools.build.lib.skyframe.serialization.ObjectCodecs;
4140
import com.google.devtools.build.lib.skyframe.serialization.testutils.RoundTripping;
4241
import com.google.devtools.build.lib.skyframe.serialization.testutils.SerializationTester;
43-
import com.google.devtools.build.lib.vfs.PathFragment;
4442
import com.google.devtools.build.lib.view.config.crosstool.CrosstoolConfig.CToolchain;
4543
import com.google.errorprone.annotations.CanIgnoreReturnValue;
46-
import com.google.protobuf.TextFormat;
4744
import java.util.List;
4845
import java.util.Objects;
4946
import javax.annotation.Nullable;
@@ -83,15 +80,6 @@ private static CcToolchainVariables createVariables(String... entries) {
8380
return variables.build();
8481
}
8582

86-
/** Creates an empty CcToolchainFeatures. */
87-
private static CcToolchainFeatures buildEmptyFeatures(String... toolchain) throws Exception {
88-
CToolchain.Builder toolchainBuilder = CToolchain.newBuilder();
89-
TextFormat.merge(Joiner.on("").join(toolchain), toolchainBuilder);
90-
return new CcToolchainFeatures(
91-
CcToolchainConfigInfo.fromToolchainForTestingOnly(toolchainBuilder.buildPartial()),
92-
PathFragment.EMPTY_FRAGMENT);
93-
}
94-
9583
private static ImmutableSet<String> getEnabledFeatures(
9684
CcToolchainFeatures features, String... requestedFeatures) throws Exception {
9785
FeatureConfiguration configuration =
@@ -109,7 +97,7 @@ private static ImmutableSet<String> getEnabledFeatures(
10997
public void testFeatureConfigurationCodec() throws Exception {
11098
FeatureConfiguration emptyConfiguration =
11199
FeatureConfiguration.intern(
112-
buildEmptyFeatures("").getFeatureConfiguration(ImmutableSet.of()));
100+
CcToolchainTestHelper.buildFeatures("").getFeatureConfiguration(ImmutableSet.of()));
113101
FeatureConfiguration emptyFeatures =
114102
CcToolchainTestHelper.buildFeatures("feature {name: 'a'}", "feature {name: 'b'}")
115103
.getFeatureConfiguration(ImmutableSet.of("a", "b"));

0 commit comments

Comments
 (0)