diff options
| author |  philwo <philwo@google.com> | 2017-05-31 13:35:27 +0200 |
|---|---|---|
| committer |  László Csomor <laszlocsomor@google.com> | 2017-05-31 13:54:05 +0200 |
| commit | c5d1d55a7fc27d72b58f14859429019b012f6a17 (patch) | |
| tree | c4553adcb33285316feda150df6355e31b1d12af /src | |
| parent | 3e87855dbc3ff21b1a11dc88a5b4941e74ff6dd2 (diff) | |
testenv.sh: Use Visual Studio 2017 if it is installed, otherwise fallback to VS2015.
This makes our Windows shell tests work on Windows systems where only VS2017 is installed.
PiperOrigin-RevId: 157573095
Diffstat (limited to 'src')
| -rwxr-xr-x | src/test/shell/testenv.sh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/test/shell/testenv.sh b/src/test/shell/testenv.sh index b7115e47cf..26c4e9f2ef 100755 --- a/src/test/shell/testenv.sh +++ b/src/test/shell/testenv.sh @@ -45,7 +45,11 @@ if is_windows; then export JAVA_HOME="$(ls -d C:/Program\ Files/Java/jdk* | sort | tail -n 1)" export BAZEL_SH="c:/tools/msys64/usr/bin/bash.exe" - export BAZEL_VC="c:/Program Files (x86)/Microsoft Visual Studio 14.0/VC" + export BAZEL_VC="c:/Program Files (x86)/Microsoft Visual Studio/2017/Professional/VC" + 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 if [ -x /c/Python27/python.exe ]; then export BAZEL_PYTHON="C:/Python27/python.exe" export PATH="/c/Python27:$PATH" |