From 68b2b5cc5110ada9876e33273b1801f1f8088cc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Reis?= Date: Sat, 30 Nov 2019 01:13:48 +0000 Subject: [PATCH] build,win: propagate error codes in vcbuild Don't exit vcbuild with error code 0 when cctest fails. Backport-PR-URL: https://github.com/nodejs/node/pull/30726 PR-URL: https://github.com/nodejs/node/pull/30724 Refs: https://github.com/nodejs/build/issues/1996 Reviewed-By: Rod Vagg Reviewed-By: Sam Roberts Reviewed-By: Rich Trott --- vcbuild.bat | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vcbuild.bat b/vcbuild.bat index 26c6b26dee69c0..c7c156e9b41d2d 100644 --- a/vcbuild.bat +++ b/vcbuild.bat @@ -68,7 +68,8 @@ set no_cctest= set cctest= set openssl_no_asm= set doc= -set extra_msbuild_args=^ +set extra_msbuild_args= +set exit_code=0 :next-arg if "%1"=="" goto args-done @@ -559,9 +560,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 echo running 'cctest %cctest_args%' "%config%\cctest" %cctest_args% +if %errorlevel% neq 0 set exit_code=%errorlevel% :run-test-py echo running 'python tools\test.py %test_args%' python tools\test.py %test_args% +if %errorlevel% neq 0 set exit_code=%errorlevel% goto test-v8 :test-v8 @@ -672,7 +675,7 @@ echo vcbuild.bat no-cctest : skip building cctest.exe goto exit :exit -goto :EOF +exit /b %exit_code% rem ***************