Commit 0aae502
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 6a53152 commit 0aae502
1 file changed
Lines changed: 4 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -68,6 +68,7 @@ set cctest= | |||
| 68 | 68 | set openssl_no_asm= | |
| 69 | 69 | set doc= | |
| 70 | 70 | set extra_msbuild_args= | |
| 71 | + set exit_code=0 | ||
| 71 | 72 | ||
| 72 | 73 | :next-arg | |
| 73 | 74 | if "%1"=="" goto args-done | |
@@ -633,9 +634,11 @@ if defined no_cctest echo Skipping cctest because no-cctest was specified && got | |||
| 633 | 634 | if not exist "%config%\cctest.exe" echo cctest.exe not found. Run "vcbuild test" or "vcbuild cctest" to build it. && goto run-test-py | |
| 634 | 635 | echo running 'cctest %cctest_args%' | |
| 635 | 636 | "%config%\cctest" %cctest_args% | |
| 637 | + if %errorlevel% neq 0 set exit_code=%errorlevel% | ||
| 636 | 638 | :run-test-py | |
| 637 | 639 | echo running 'python tools\test.py %test_args%' | |
| 638 | 640 | python tools\test.py %test_args% | |
| 641 | + if %errorlevel% neq 0 set exit_code=%errorlevel% | ||
| 639 | 642 | goto test-v8 | |
| 640 | 643 | ||
| 641 | 644 | :test-v8 | |
@@ -715,7 +718,7 @@ echo vcbuild.bat no-cctest : skip building cctest.exe | |||
| 715 | 718 | goto exit | |
| 716 | 719 | ||
| 717 | 720 | :exit | |
| 718 | - goto :EOF | ||
| 721 | + exit /b %exit_code% | ||
| 719 | 722 | ||
| 720 | 723 | ||
| 721 | 724 | rem *************** | |
0 commit comments