1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

build,win: propagate error codes in vcbuild

Browse Source 
Don't exit vcbuild with error code 0 when cctest fails.

PR-URL: https://github.com/nodejs/node/pull/30724
Refs: https://github.com/nodejs/build/issues/1996
Reviewed-By: Rod Vagg <rod@vagg.org>
Reviewed-By: Sam Roberts <vieuxtech@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
This commit is contained in:
João Reis 2019-11-30 01:13:48 +00:00 committed by Rich Trott
parent 001d250855
commit 3b484edce3
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
vcbuild.bat
View File

@ -68,6 +68,7 @@ set cctest=
set openssl_no_asm= set openssl_no_asm=
set doc= set doc=
set extra_msbuild_args= set extra_msbuild_args=
set exit_code=0
:next-arg :next-arg
if "%1"=="" goto args-done if "%1"=="" goto args-done
@ -633,9 +634,11 @@ if defined no_cctest echo Skipping cctest because no-cctest was specified && got
if not exist "%config%\cctest.exe" echo cctest.exe not found. Run "vcbuild test" or "vcbuild cctest" to build it. && goto run-test-py if not exist "%config%\cctest.exe" echo cctest.exe not found. Run "vcbuild test" or "vcbuild cctest" to build it. && goto run-test-py
echo running 'cctest %cctest_args%' echo running 'cctest %cctest_args%'
"%config%\cctest" %cctest_args% "%config%\cctest" %cctest_args%
if %errorlevel% neq 0 set exit_code=%errorlevel%
:run-test-py :run-test-py
echo running 'python tools\test.py %test_args%' echo running 'python tools\test.py %test_args%'
python tools\test.py %test_args% python tools\test.py %test_args%
if %errorlevel% neq 0 set exit_code=%errorlevel%
goto test-v8 goto test-v8
:test-v8 :test-v8
@ -715,7 +718,7 @@ echo vcbuild.bat no-cctest : skip building cctest.exe
goto exit goto exit
:exit :exit
goto :EOF exit /b %exit_code%
rem *************** rem ***************