aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfuzzard <fuzzard@kodi.tv>2022-06-11 15:35:38 +1000
committerfuzzard <fuzzard@kodi.tv>2022-06-12 11:34:17 +1000
commit43bc3956b453ec808971e4641b075d20a1f89025 (patch)
tree0b1709fbb124897bbea2d6f17a185a40f594a260
parentfa7a5ddab1cb04ef0973463680d7abfac85c997b (diff)
downloadxbmc-43bc3956b453ec808971e4641b075d20a1f89025.tar.xz
[windows] run-tests call vswhere to set dev env vars
-rw-r--r--tools/buildsteps/windows/win32/run-tests.bat7
-rw-r--r--tools/buildsteps/windows/x64/run-tests.bat7
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