summaryrefslogtreecommitdiff
path: root/build-test.cmd
diff options
context:
space:
mode:
Diffstat (limited to 'build-test.cmd')
-rw-r--r--build-test.cmd14
1 files changed, 13 insertions, 1 deletions
diff --git a/build-test.cmd b/build-test.cmd
index 7a14908d25..9142eeea01 100644
--- a/build-test.cmd
+++ b/build-test.cmd
@@ -397,6 +397,13 @@ REM ===
REM =========================================================================================
call %__ProjectDir%\run.cmd build -Project=%__ProjectDir%\tests\helixprep.proj -MsBuildLog=!__msbuildLog! -MsBuildWrn=!__msbuildWrn! -MsBuildErr=!__msbuildErr! %__RunArgs% %__BuildAgainstPackagesArg% %RuntimeIdArg% %TargetsWindowsArg% %__CrossgenArg% %__unprocessedBuildArgs%
+if errorlevel 1 (
+ echo %__MsgPrefix%Error: build failed. Refer to the build log files for details:
+ echo %__BuildLog%
+ echo %__BuildWrn%
+ echo %__BuildErr%
+ exit /b 1
+)
echo %__MsgPrefix% Prepped test binaries for publishing
@@ -472,6 +479,11 @@ if /i "%__ToolsetDir%" == "" (
exit /b 1
)
+if not exist "%__ToolsetDir%"\buildenv_arm64.cmd goto :Not_EWDK
+call "%__ToolsetDir%"\buildenv_arm64.cmd
+exit /b 0
+
+:Not_EWDK
set PATH=%__ToolsetDir%\VC_sdk\bin;%PATH%
set LIB=%__ToolsetDir%\VC_sdk\lib\arm64;%__ToolsetDir%\sdpublic\sdk\lib\arm64
set INCLUDE=^
@@ -513,4 +525,4 @@ if %__exitCode% neq 0 (
)
echo Successfully precompiled %2
-exit /b 0 \ No newline at end of file
+exit /b 0