diff options
| author | Richard Lau <riclau@uk.ibm.com> | 2020-05-01 14:07:15 +0300 |
|---|---|---|
| committer | Richard Lau <riclau@uk.ibm.com> | 2020-05-06 16:39:58 +0300 |
| commit | 120d7076d5462f7f664ed0c92be26541e3298a24 (patch) | |
| tree | 8c9fd9d34b242f977072e2ca0585bd8149c3b76a /vcbuild.bat | |
| parent | a22991b04461a1aa8dd6e1793f26f3b9e6eaaa27 (diff) | |
Revert "src: add test/abort build tasks"
This reverts commit e08ac095690015a8c488e05251e05feb2acc57a0.
PR-URL: https://github.com/nodejs/node/pull/33196
Refs: https://github.com/nodejs/node/pull/31740
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Diffstat (limited to 'vcbuild.bat')
| -rw-r--r-- | vcbuild.bat | 30 |
1 files changed, 4 insertions, 26 deletions
diff --git a/vcbuild.bat b/vcbuild.bat index 22c3e237acf..0187e652bd7 100644 --- a/vcbuild.bat +++ b/vcbuild.bat @@ -16,11 +16,11 @@ if /i "%1"=="/?" goto help cd %~dp0 @rem CI_* variables should be kept synchronized with the ones in Makefile -set CI_NATIVE_SUITES=addons js-native-api node-api abort +set CI_NATIVE_SUITES=addons js-native-api node-api set CI_JS_SUITES=default set CI_DOC=doctool @rem Same as the test-ci target in Makefile -set "common_test_suites=%CI_JS_SUITES% %CI_NATIVE_SUITES% %CI_DOC%&set build_addons=1&set build_js_native_api_tests=1&set build_node_api_tests=1&set build_aborts_tests=1" +set "common_test_suites=%CI_JS_SUITES% %CI_NATIVE_SUITES% %CI_DOC%&set build_addons=1&set build_js_native_api_tests=1&set build_node_api_tests=1" @rem Process arguments. set config=Release @@ -68,7 +68,6 @@ set openssl_no_asm= set doc= set extra_msbuild_args= set exit_code=0 -set build_aborts_tests= :next-arg if "%1"=="" goto args-done @@ -97,8 +96,6 @@ if /i "%1"=="test-ci-js" set test_args=%test_args% %test_ci_args% -J -p tap - if /i "%1"=="build-addons" set build_addons=1&goto arg-ok if /i "%1"=="build-js-native-api-tests" set build_js_native_api_tests=1&goto arg-ok if /i "%1"=="build-node-api-tests" set build_node_api_tests=1&goto arg-ok -if /i "%1"=="build-abort-tests" set build_abort_tests=1&goto arg-ok -if /i "%1"=="test-abort" set test_args=%test_args% abort&set build_abort_tests=1&goto arg-ok if /i "%1"=="test-addons" set test_args=%test_args% addons&set build_addons=1&goto arg-ok if /i "%1"=="test-js-native-api" set test_args=%test_args% js-native-api&set build_js_native_api_tests=1&goto arg-ok if /i "%1"=="test-node-api" set test_args=%test_args% node-api&set build_node_api_tests=1&goto arg-ok @@ -588,10 +585,10 @@ endlocal goto build-node-api-tests :build-node-api-tests -if not defined build_node_api_tests goto build-abort-tests +if not defined build_node_api_tests goto run-tests if not exist "%node_exe%" ( echo Failed to find node.exe - goto build-abort-tests + goto run-tests ) echo Building node-api :: clear @@ -604,25 +601,6 @@ set npm_config_nodedir=%~dp0 "%node_exe%" "%~dp0tools\build-addons.js" "%~dp0deps\npm\node_modules\node-gyp\bin\node-gyp.js" "%~dp0test\node-api" if errorlevel 1 exit /b 1 endlocal -goto build-abort-tests - -:build-abort-tests -if not defined build_abort_tests goto run-tests -if not exist "%node_exe%" ( - echo Failed to find node.exe - goto run-tests -) -echo Building abort -:: clear -for /d %%F in (test\abort\??_*) do ( - rd /s /q %%F -) -:: building abort -setlocal -set npm_config_nodedir=%~dp0 -"%node_exe%" "%~dp0tools\build-addons.js" "%~dp0deps\npm\node_modules\node-gyp\bin\node-gyp.js" "%~dp0test\abort" -if errorlevel 1 exit /b 1 -endlocal goto run-tests :run-tests |