aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/test
diff options
context:
space:
mode:
authorGravatar Marcel Hlopko <hlopko@google.com>2016-10-12 14:41:42 +0000
committerGravatar Yun Peng <pcloudy@google.com>2016-10-12 17:12:36 +0000
commitb4d69c470a7a0ef8ed93872cba02ad2b5218f976 (patch)
tree5b20ff142f170babe3d9843fb7d7acd4a07f8b51 /src/test
parentf695c54a8f5f6be7adb678d305005f78e4b44424 (diff)
Fix failing test on windows #1930
-- Reviewed-on: https://bazel-review.googlesource.com/#/c/6610/ MOS_MIGRATED_REVID=135915721
Diffstat (limited to 'src/test')
-rw-r--r--src/test/java/com/google/devtools/build/lib/rules/cpp/LinkBuildVariablesTest.java15
1 files changed, 15 insertions, 0 deletions
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 5cd2ce3a91..f644991efa 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
@@ -19,6 +19,7 @@ import static com.google.common.truth.Truth.assertThat;
import com.google.common.collect.Iterables;
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.analysis.util.BuildViewTestCase;
import com.google.devtools.build.lib.rules.cpp.CcToolchainFeatures.FeatureConfiguration;
import com.google.devtools.build.lib.rules.cpp.CcToolchainFeatures.Variables;
@@ -168,6 +169,13 @@ public class LinkBuildVariablesTest extends BuildViewTestCase {
*/
@Test
public void testInterfaceLibraryBuildingVariablesWhenGenerationPossible() throws Exception {
+ // Make sure the interface shared object generation is enabled in the configuration
+ // (which it is not by default for some windows toolchains)
+ AnalysisMock.get()
+ .ccSupport()
+ .setupCrosstool(mockToolsConfig, "supports_interface_shared_objects: true");
+ useConfiguration();
+
scratch.file("x/BUILD", "cc_library(", " name = 'foo',", " srcs = ['a.cc'],", ")");
scratch.file("x/a.cc");
@@ -195,6 +203,13 @@ public class LinkBuildVariablesTest extends BuildViewTestCase {
@Test
public void testInterfaceLibraryBuildingVariablesWhenGenerationNotAllowed() throws Exception {
+ // Make sure the interface shared object generation is enabled in the configuration
+ // (which it is not by default for some windows toolchains)
+ AnalysisMock.get()
+ .ccSupport()
+ .setupCrosstool(mockToolsConfig, "supports_interface_shared_objects: true");
+ useConfiguration();
+
scratch.file("x/BUILD", "cc_library(", " name = 'foo',", " srcs = ['a.cc'],", ")");
scratch.file("x/a.cc");