Skip to content

Commit 68b2b5c

Browse files
joaocgreisMylesBorins
authored andcommitted
build,win: propagate error codes in vcbuild
Don't exit vcbuild with error code 0 when cctest fails. Backport-PR-URL: #30726 PR-URL: #30724 Refs: nodejs/build#1996 Reviewed-By: Rod Vagg <[email protected]> Reviewed-By: Sam Roberts <[email protected]> Reviewed-By: Rich Trott <[email protected]>
1 parent 88e8b7c commit 68b2b5c

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

vcbuild.bat

+5-2
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,8 @@ set no_cctest=
6868
set cctest=
6969
set openssl_no_asm=
7070
set doc=
71-
set extra_msbuild_args=^
71+
set extra_msbuild_args=
72+
set exit_code=0
7273

7374
:next-arg
7475
if "%1"=="" goto args-done
@@ -559,9 +560,11 @@ if defined no_cctest echo Skipping cctest because no-cctest was specified && got
559560
if not exist "%config%\cctest.exe" echo cctest.exe not found. Run "vcbuild test" or "vcbuild cctest" to build it. && goto run-test-py
560561
echo running 'cctest %cctest_args%'
561562
"%config%\cctest" %cctest_args%
563+
if %errorlevel% neq 0 set exit_code=%errorlevel%
562564
:run-test-py
563565
echo running 'python tools\test.py %test_args%'
564566
python tools\test.py %test_args%
567+
if %errorlevel% neq 0 set exit_code=%errorlevel%
565568
goto test-v8
566569

567570
:test-v8
@@ -672,7 +675,7 @@ echo vcbuild.bat no-cctest : skip building cctest.exe
672675
goto exit
673676

674677
:exit
675-
goto :EOF
678+
exit /b %exit_code%
676679

677680

678681
rem ***************

0 commit comments

Comments
 (0)