diff options
Diffstat (limited to 'src/test/shell/testenv.sh')
| -rwxr-xr-x | src/test/shell/testenv.sh | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/src/test/shell/testenv.sh b/src/test/shell/testenv.sh index 5293f3f7ba..8e82ba706f 100755 --- a/src/test/shell/testenv.sh +++ b/src/test/shell/testenv.sh @@ -54,32 +54,9 @@ if is_windows; then # TODO(philwo) remove this once we have a Bazel release that includes the CL # moving the Windows-specific TEST_TMPDIR into TestStrategy. TEST_TMPDIR_BASENAME="$(basename "$TEST_TMPDIR")" - export TEST_TMPDIR="c:/temp/${TEST_TMPDIR_BASENAME}" - - # Bazel (TMPDIR) and Windows (TEMP, TMP) have three envvars that specify the - # location of the temp directory... - export TMPDIR="$TEST_TMPDIR" - export TEMP="$TEST_TMPDIR" - export TMP="$TEST_TMPDIR" 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/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 - if [ -x /c/Python27/python.exe ]; then - export BAZEL_PYTHON="C:/Python27/python.exe" - export PATH="/c/Python27:$PATH" - elif [ -x /c/python_27_amd64/files/python.exe ]; then - export BAZEL_PYTHON="C:/python_27_amd64/files/python.exe" - export PATH="/c/python_27_amd64/files:$PATH" - fi + export BAZEL_SH="$(cygpath -m /usr/bin/bash)" fi # Make the command "bazel" available for tests. |