diff options
| author | fuzzard <fuzzard@users.noreply.github.com> | 2022-06-12 06:21:15 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-12 06:21:15 +1000 |
| commit | 692173923f79f12c6cd544a107a2d9013f5fe954 (patch) | |
| tree | feee6524aa342bc8900b18baf931e702cd6c5583 | |
| parent | bfd95386fcf015cf2dce5f13e36a1acfaacb0cd0 (diff) | |
| parent | aa7cc67ecaacc1a4e13f4bb700be8736ad963381 (diff) | |
Merge pull request #21540 from fuzzard/win_runtests
[windows] run-tests call vswhere to set dev env vars
| -rw-r--r-- | tools/buildsteps/windows/win32/run-tests.bat | 7 | ||||
| -rw-r--r-- | tools/buildsteps/windows/x64/run-tests.bat | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/tools/buildsteps/windows/win32/run-tests.bat b/tools/buildsteps/windows/win32/run-tests.bat index 4d811fd200..1c07563f15 100644 --- a/tools/buildsteps/windows/win32/run-tests.bat +++ b/tools/buildsteps/windows/win32/run-tests.bat @@ -1,7 +1,12 @@ @ECHO OFF PUSHD %~dp0\.. - +CALL vswhere.bat x86 +IF ERRORLEVEL 1 ( + ECHO ERROR! run-tests.bat: Something went wrong when calling vswhere.bat + POPD + EXIT /B 1 +) SET TARGET_PLATFORM=x86 CALL run-tests.bat diff --git a/tools/buildsteps/windows/x64/run-tests.bat b/tools/buildsteps/windows/x64/run-tests.bat index 0c099b5268..a21ea896ff 100644 --- a/tools/buildsteps/windows/x64/run-tests.bat +++ b/tools/buildsteps/windows/x64/run-tests.bat @@ -1,7 +1,12 @@ @ECHO OFF PUSHD %~dp0\.. - +CALL vswhere.bat x64 +IF ERRORLEVEL 1 ( + ECHO ERROR! run-tests.bat: Something went wrong when calling vswhere.bat + POPD + EXIT /B 1 +) SET TARGET_PLATFORM=x64 CALL run-tests.bat |