FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Revert "src: add test/abort build tasks" · nodejs/node@5ff3192 · GitHub

/ node Public

Commit 5ff3192

Browse files
richardlau
authored and
codebytere
committed
Revert "src: add test/abort build tasks"
This reverts commit e08ac09. PR-URL: #33196 Refs: #31740 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
1 parent a56b600 commit 5ff3192

2 files changed

Lines changed: 10 additions & 73 deletions

File tree

‎Makefile‎

Lines changed: 6 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ v8:
295295
tools/make-v8.sh $(V8_ARCH).$(BUILDTYPE_LOWER) $(V8_BUILD_OPTIONS)
296296

297297
.PHONY: jstest
298-
jstest: build-addons build-abort-tests build-js-native-api-tests build-node-api-tests ## Runs addon tests and JS tests
298+
jstest: build-addons build-js-native-api-tests build-node-api-tests ## Runs addon tests and JS tests
299299
$(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) \
300300
--skip-tests=$(CI_SKIP_TESTS) \
301301
$(CI_JS_SUITES) \
@@ -319,7 +319,6 @@ test: all ## Runs default tests, linters, and builds docs.
319319
$(MAKE) -s tooltest
320320
$(MAKE) -s test-doc
321321
$(MAKE) -s build-addons
322-
$(MAKE) -s build-abort-tests
323322
$(MAKE) -s build-js-native-api-tests
324323
$(MAKE) -s build-node-api-tests
325324
$(MAKE) -s cctest
@@ -328,7 +327,6 @@ test: all ## Runs default tests, linters, and builds docs.
328327
.PHONY: test-only
329328
test-only: all ## For a quick test, does not run linter or build docs.
330329
$(MAKE) build-addons
331-
$(MAKE) build-abort-tests
332330
$(MAKE) build-js-native-api-tests
333331
$(MAKE) build-node-api-tests
334332
$(MAKE) cctest
@@ -338,7 +336,6 @@ test-only: all ## For a quick test, does not run linter or build docs.
338336
# Used by `make coverage-test`
339337
test-cov: all
340338
$(MAKE) build-addons
341-
$(MAKE) build-abort-tests
342339
$(MAKE) build-js-native-api-tests
343340
$(MAKE) build-node-api-tests
344341
$(MAKE) cctest
@@ -458,31 +455,6 @@ test/node-api/.buildstamp: $(ADDONS_PREREQS) \
458455
# TODO(bnoordhuis) Force rebuild after gyp or node-gyp update.
459456
build-node-api-tests: | $(NODE_EXE) test/node-api/.buildstamp
460457

461-
ABORT_BINDING_GYPS := \
462-
$(filter-out test/abort/??_*/binding.gyp, \
463-
$(wildcard test/abort/*/binding.gyp))
464-
465-
ABORT_BINDING_SOURCES := \
466-
$(filter-out test/abort/??_*/*.c, $(wildcard test/abort/*/*.c)) \
467-
$(filter-out test/abort/??_*/*.cc, $(wildcard test/abort/*/*.cc)) \
468-
$(filter-out test/abort/??_*/*.h, $(wildcard test/abort/*/*.h))
469-
470-
# Implicitly depends on $(NODE_EXE), see the build-node-api-tests rule for rationale.
471-
test/abort/.buildstamp: $(ADDONS_PREREQS) \
472-
$(ABORT_BINDING_GYPS) $(ABORT_BINDING_SOURCES) \
473-
src/node_api.h src/node_api_types.h src/js_native_api.h \
474-
src/js_native_api_types.h src/js_native_api_v8.h src/js_native_api_v8_internals.h
475-
@$(call run_build_addons,"$$PWD/test/abort",$@)
476-
477-
.PHONY: build-abort-tests
478-
# .buildstamp needs $(NODE_EXE) but cannot depend on it
479-
# directly because it calls make recursively. The parent make cannot know
480-
# if the subprocess touched anything so it pessimistically assumes that
481-
# .buildstamp is out of date and need a rebuild.
482-
# Just goes to show that recursive make really is harmful...
483-
# TODO(bnoordhuis) Force rebuild after gyp or node-gyp update.
484-
build-abort-tests: | $(NODE_EXE) test/abort/.buildstamp
485-
486458
BENCHMARK_NAPI_BINDING_GYPS := $(wildcard benchmark/napi/*/binding.gyp)
487459

488460
BENCHMARK_NAPI_BINDING_SOURCES := \
@@ -503,14 +475,12 @@ clear-stalled:
503475
echo $${PS_OUT} | xargs kill -9; \
504476
fi
505477

506-
test-build: | all build-addons build-abort-tests build-js-native-api-tests build-node-api-tests
478+
test-build: | all build-addons build-js-native-api-tests build-node-api-tests
507479

508480
test-build-js-native-api: all build-js-native-api-tests
509481

510482
test-build-node-api: all build-node-api-tests
511483

512-
test-build-abort: all build-abort-tests
513-
514484
.PHONY: test-all
515485
test-all: test-build ## Run default tests with both Debug and Release builds.
516486
$(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=debug,release
@@ -523,7 +493,7 @@ test-all-suites: | clear-stalled test-build bench-addons-build doc-only ## Run a
523493
$(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) test/*
524494

525495
# CI_* variables should be kept synchronized with the ones in vcbuild.bat
526-
CI_NATIVE_SUITES ?= addons js-native-api node-api abort
496+
CI_NATIVE_SUITES ?= addons js-native-api node-api
527497
CI_JS_SUITES ?= default
528498
ifeq ($(node_use_openssl), false)
529499
CI_DOC := doctool
@@ -535,7 +505,7 @@ endif
535505
# Build and test addons without building anything else
536506
# Related CI job: node-test-commit-arm-fanned
537507
test-ci-native: LOGLEVEL := info
538-
test-ci-native: | test/addons/.buildstamp test/js-native-api/.buildstamp test/node-api/.buildstamp test/abort/.buildstamp
508+
test-ci-native: | test/addons/.buildstamp test/js-native-api/.buildstamp test/node-api/.buildstamp
539509
$(PYTHON) tools/test.py $(PARALLEL_ARGS) -p tap --logfile test.tap \
540510
--mode=$(BUILDTYPE_LOWER) --flaky-tests=$(FLAKY_TESTS) \
541511
$(TEST_CI_ARGS) $(CI_NATIVE_SUITES)
@@ -557,7 +527,7 @@ test-ci-js: | clear-stalled
557527
.PHONY: test-ci
558528
# Related CI jobs: most CI tests, excluding node-test-commit-arm-fanned
559529
test-ci: LOGLEVEL := info
560-
test-ci: | clear-stalled build-addons build-abort-tests build-js-native-api-tests build-node-api-tests doc-only
530+
test-ci: | clear-stalled build-addons build-js-native-api-tests build-node-api-tests doc-only
561531
out/Release/cctest --gtest_output=xml:out/junit/cctest.xml
562532
$(PYTHON) tools/test.py $(PARALLEL_ARGS) -p tap --logfile test.tap \
563533
--mode=$(BUILDTYPE_LOWER) --flaky-tests=$(FLAKY_TESTS) \
@@ -663,17 +633,8 @@ test-node-api-clean:
663633
$(RM) -r test/node-api/*/build
664634
$(RM) test/node-api/.buildstamp
665635

666-
.PHONY: test-abort
667-
test-abort: test-build-abort
668-
$(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) test-abort
669-
670-
.PHONY: test-abort-clean
671-
test-abort-clean:
672-
$(RM) -r test/abort/*/build
673-
$(RM) test/abort/.buildstamp
674-
675636
.PHONY: test-addons
676-
test-addons: test-build test-js-native-api test-node-api test-abort
637+
test-addons: test-build test-js-native-api test-node-api
677638
$(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) addons
678639

679640
.PHONY: test-addons-clean
@@ -683,7 +644,6 @@ test-addons-clean:
683644
$(RM) test/addons/.buildstamp test/addons/.docbuildstamp
684645
$(MAKE) test-js-native-api-clean
685646
$(MAKE) test-node-api-clean
686-
$(MAKE) test-abort-clean
687647

688648
test-async-hooks:
689649
$(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) async-hooks
@@ -692,7 +652,6 @@ test-with-async-hooks:
692652
$(MAKE) build-addons
693653
$(MAKE) build-js-native-api-tests
694654
$(MAKE) build-node-api-tests
695-
$(MAKE) build-abort-tests
696655
$(MAKE) cctest
697656
NODE_TEST_WITH_ASYNC_HOOKS=1 $(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) \
698657
$(CI_JS_SUITES) \

‎vcbuild.bat‎

Lines changed: 4 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ if /i "%1"=="/?" goto help
1616
cd %~dp0
1717

1818
@rem CI_* variables should be kept synchronized with the ones in Makefile
19-
set CI_NATIVE_SUITES=addons js-native-api node-api abort
19+
set CI_NATIVE_SUITES=addons js-native-api node-api
2020
set CI_JS_SUITES=default
2121
set CI_DOC=doctool
2222
@rem Same as the test-ci target in Makefile
23-
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"
23+
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"
2424

2525
@rem Process arguments.
2626
set config=Release
@@ -68,7 +68,6 @@ set openssl_no_asm=
6868
set doc=
6969
set extra_msbuild_args=
7070
set exit_code=0
71-
set build_aborts_tests=
7271

7372
:next-arg
7473
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 -
9796
if /i "%1"=="build-addons" set build_addons=1&goto arg-ok
9897
if /i "%1"=="build-js-native-api-tests" set build_js_native_api_tests=1&goto arg-ok
9998
if /i "%1"=="build-node-api-tests" set build_node_api_tests=1&goto arg-ok
100-
if /i "%1"=="build-abort-tests" set build_abort_tests=1&goto arg-ok
101-
if /i "%1"=="test-abort" set test_args=%test_args% abort&set build_abort_tests=1&goto arg-ok
10299
if /i "%1"=="test-addons" set test_args=%test_args% addons&set build_addons=1&goto arg-ok
103100
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
104101
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
588585
goto build-node-api-tests
589586

590587
:build-node-api-tests
591-
if not defined build_node_api_tests goto build-abort-tests
588+
if not defined build_node_api_tests goto run-tests
592589
if not exist "%node_exe%" (
593590
echo Failed to find node.exe
594-
goto build-abort-tests
591+
goto run-tests
595592
)
596593
echo Building node-api
597594
:: clear
@@ -604,25 +601,6 @@ set npm_config_nodedir=%~dp0
604601
"%node_exe%" "%~dp0tools\build-addons.js" "%~dp0deps\npm\node_modules\node-gyp\bin\node-gyp.js" "%~dp0test\node-api"
605602
if errorlevel 1 exit /b 1
606603
endlocal
607-
goto build-abort-tests
608-
609-
:build-abort-tests
610-
if not defined build_abort_tests goto run-tests
611-
if not exist "%node_exe%" (
612-
echo Failed to find node.exe
613-
goto run-tests
614-
)
615-
echo Building abort
616-
:: clear
617-
for /d %%F in (test\abort\??_*) do (
618-
rd /s /q %%F
619-
)
620-
:: building abort
621-
setlocal
622-
set npm_config_nodedir=%~dp0
623-
"%node_exe%" "%~dp0tools\build-addons.js" "%~dp0deps\npm\node_modules\node-gyp\bin\node-gyp.js" "%~dp0test\abort"
624-
if errorlevel 1 exit /b 1
625-
endlocal
626604
goto run-tests
627605

628606
:run-tests

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL