From e7f6fbecef4a55c81daba8e7b3434eeb53888943 Mon Sep 17 00:00:00 2001 From: Yun Peng Date: Thu, 19 Jan 2017 17:12:58 +0000 Subject: [PATCH] Fix testLinkerParamFileIsExported on Windows Fixed: https://github.com/bazelbuild/bazel/issues/2376 -- PiperOrigin-RevId: 144969681 MOS_MIGRATED_REVID=144969681 --- .../devtools/build/lib/rules/cpp/LinkBuildVariablesTest.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 663c51c9d494d2..e8c86bf4439844 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 @@ -26,6 +26,7 @@ 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.Link.LinkTargetType; +import com.google.devtools.build.lib.util.OsUtils; import java.util.List; import org.junit.Test; import org.junit.runner.RunWith; @@ -170,7 +171,8 @@ public void testLinkerParamFileIsExported() throws Exception { Variables variables = getLinkBuildVariables(target, Link.LinkTargetType.EXECUTABLE); List variableValue = getVariableValue(variables, CppLinkActionBuilder.LINKER_PARAM_FILE_VARIABLE); - assertThat(Iterables.getOnlyElement(variableValue)).matches(".*bin/x/bin-2.params$"); + assertThat(Iterables.getOnlyElement(variableValue)).matches(".*bin/x/bin" + + OsUtils.executableExtension() + "-2.params$"); } @Test