aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Yun Peng <pcloudy@google.com>2017-01-19 17:12:58 +0000
committerGravatar Vladimir Moskva <vladmos@google.com>2017-01-19 18:04:58 +0000
commite7f6fbecef4a55c81daba8e7b3434eeb53888943 (patch)
tree35f6f264013c08099ac779e09b011331f1dd1c12
parent304a8a9b4728cf86b0def4526993ea941d10eade (diff)
Fix testLinkerParamFileIsExported on Windows
Fixed: https://github.com/bazelbuild/bazel/issues/2376 -- PiperOrigin-RevId: 144969681 MOS_MIGRATED_REVID=144969681
-rw-r--r--src/test/java/com/google/devtools/build/lib/rules/cpp/LinkBuildVariablesTest.java4
1 files changed, 3 insertions, 1 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 663c51c9d4..e8c86bf443 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;
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 class LinkBuildVariablesTest extends BuildViewTestCase {
Variables variables = getLinkBuildVariables(target, Link.LinkTargetType.EXECUTABLE);
List<String> 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