aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/test
diff options
context:
space:
mode:
authorGravatar László Csomor <laszlocsomor@google.com>2017-08-25 15:18:37 +0200
committerGravatar Damien Martin-Guillerez <dmarting@google.com>2017-08-25 16:04:48 +0200
commitbb94d1b74280a98189114f7636195b3f745fb523 (patch)
tree996a4e751025286ec747eb1fcb16826da1333a95 /src/test
parent884376d3b329d7234263bd199710ffecea0cedb6 (diff)
testenv.sh,Windows: support VC BuildTools 2017
Change-Id: I087eab43e321f99a17bbe442abdebc8711a73801 PiperOrigin-RevId: 166468950
Diffstat (limited to 'src/test')
-rwxr-xr-xsrc/test/shell/testenv.sh4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/test/shell/testenv.sh b/src/test/shell/testenv.sh
index 1906811515..cb4f275f1c 100755
--- a/src/test/shell/testenv.sh
+++ b/src/test/shell/testenv.sh
@@ -47,6 +47,10 @@ if is_windows; then
export BAZEL_SH="c:/tools/msys64/usr/bin/bash.exe"
export BAZEL_VC="c:/Program Files (x86)/Microsoft Visual Studio/2017/Professional/VC"
if [ ! -d "$BAZEL_VC" ]; then
+ # Maybe Visual C++ Build Tools 2017 then?
+ export BAZEL_VC="c:/Program Files (x86)/Microsoft Visual Studio/2017/BuildTools/VC"
+ fi
+ if [ ! -d "$BAZEL_VC" ]; then
# OK, well, maybe Visual C++ 2015 then?
export BAZEL_VC="c:/Program Files (x86)/Microsoft Visual Studio 14.0/VC"
fi