Skip to content

Commit b18c8d3

Browse files
joaocgreistargos
authored andcommitted
build,win: propagate error codes in vcbuild
Don't exit vcbuild with error code 0 when cctest fails. PR-URL: #30724 Refs: nodejs/build#1996 Reviewed-By: Rod Vagg <rod@vagg.org> Reviewed-By: Sam Roberts <vieuxtech@gmail.com> Reviewed-By: Rich Trott <rtrott@gmail.com>
1 parent 8dd5eec commit b18c8d3

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

vcbuild.bat

+4-1
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ set cctest=
6868
set openssl_no_asm=
6969
set doc=
7070
set extra_msbuild_args=
71+
set exit_code=0
7172

7273
:next-arg
7374
if "%1"=="" goto args-done
@@ -629,9 +630,11 @@ if defined no_cctest echo Skipping cctest because no-cctest was specified && got
629630
if not exist "%config%\cctest.exe" echo cctest.exe not found. Run "vcbuild test" or "vcbuild cctest" to build it. && goto run-test-py
630631
echo running 'cctest %cctest_args%'
631632
"%config%\cctest" %cctest_args%
633+
if %errorlevel% neq 0 set exit_code=%errorlevel%
632634
:run-test-py
633635
echo running 'python tools\test.py %test_args%'
634636
python tools\test.py %test_args%
637+
if %errorlevel% neq 0 set exit_code=%errorlevel%
635638
goto test-v8
636639

637640
:test-v8
@@ -714,7 +717,7 @@ echo vcbuild.bat no-cctest : skip building cctest.exe
714717
goto exit
715718

716719
:exit
717-
goto :EOF
720+
exit /b %exit_code%
718721

719722

720723
rem ***************

0 commit comments

Comments
 (0)