diff options
| author | João Reis <reis@janeasystems.com> | 2019-11-30 01:13:48 +0000 |
|---|---|---|
| committer | Rich Trott <rtrott@gmail.com> | 2019-12-02 08:38:56 -0800 |
| commit | 3b484edce3736cbcba26be1eec512df5282ca5bf (patch) | |
| tree | 441cb1ac9a2b1deb554e72713e69d5f32162d081 | |
| parent | 001d250855091728cff657138fd2059e2066185b (diff) | |
| download | android-node-v8-3b484edce3736cbcba26be1eec512df5282ca5bf.tar.gz android-node-v8-3b484edce3736cbcba26be1eec512df5282ca5bf.tar.bz2 android-node-v8-3b484edce3736cbcba26be1eec512df5282ca5bf.zip | |
build,win: propagate error codes in vcbuild
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>
| -rw-r--r-- | vcbuild.bat | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/vcbuild.bat b/vcbuild.bat index 677978cb3e..1e142a658b 100644 --- a/vcbuild.bat +++ b/vcbuild.bat @@ -68,6 +68,7 @@ set cctest= set openssl_no_asm= set doc= set extra_msbuild_args= +set exit_code=0 :next-arg 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 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 @@ -715,7 +718,7 @@ echo vcbuild.bat no-cctest : skip building cctest.exe goto exit :exit -goto :EOF +exit /b %exit_code% rem *************** |