diff options
author | Yun Peng <pcloudy@google.com> | 2016-11-16 10:30:39 +0000 |
---|---|---|
committer | Kristina Chodorow <kchodorow@google.com> | 2016-11-16 16:00:33 +0000 |
commit | 544d89ae6c46127f5a1894adf893f89b252b3a09 (patch) | |
tree | 791f579143134a8bfee12333b2318097157c6413 /src/test/java/com | |
parent | d5500a29b61764b76c09f36542ba506b9ed083ec (diff) |
Fix ProtoLangToolchainTest on Windows
Fix https://github.com/bazelbuild/bazel/issues/2082
RELNOTES:
--
MOS_MIGRATED_REVID=139307613
Diffstat (limited to 'src/test/java/com')
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/BUILD | 1 | ||||
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/rules/proto/ProtoLangToolchainTest.java | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/BUILD b/src/test/java/com/google/devtools/build/lib/BUILD index dd2b998d56..4e14f536be 100644 --- a/src/test/java/com/google/devtools/build/lib/BUILD +++ b/src/test/java/com/google/devtools/build/lib/BUILD @@ -1144,6 +1144,7 @@ java_test( ":analysis_testutil", "//src/main/java/com/google/devtools/build/lib:build-base", "//src/main/java/com/google/devtools/build/lib:proto-rules", + "//src/main/java/com/google/devtools/build/lib:util", "//src/main/java/com/google/devtools/build/lib/cmdline", "//third_party:guava", "//third_party:junit4", diff --git a/src/test/java/com/google/devtools/build/lib/rules/proto/ProtoLangToolchainTest.java b/src/test/java/com/google/devtools/build/lib/rules/proto/ProtoLangToolchainTest.java index afd43e3929..5bc6ce32ae 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/proto/ProtoLangToolchainTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/proto/ProtoLangToolchainTest.java @@ -22,6 +22,8 @@ import com.google.common.eventbus.EventBus; import com.google.devtools.build.lib.analysis.TransitiveInfoCollection; import com.google.devtools.build.lib.analysis.util.BuildViewTestCase; import com.google.devtools.build.lib.cmdline.Label; +import com.google.devtools.build.lib.util.OsUtils; + import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; @@ -54,7 +56,7 @@ public class ProtoLangToolchainTest extends BuildViewTestCase { assertThat(toolchain.commandLine()).isEqualTo("cmd-line"); assertThat(toolchain.pluginExecutable().getExecutable().getRootRelativePathString()) - .isEqualTo("x/plugin"); + .isEqualTo("x/plugin" + OsUtils.executableExtension()); TransitiveInfoCollection runtimes = toolchain.runtime(); assertThat(runtimes.getLabel()).isEqualTo(Label.parseAbsolute("//x:runtime")); |