GeezerVison

The World Wide Web, restored to 800 pixels of glory.

GeezerVison is showing github.com — Revert "src: add test/abort build tasks" · nodejs/node@5ff3192

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

Makefile
vcbuild.bat

Expand file treeCollapse file tree

Open diff view settings

Collapse file

`‎Makefile‎`

Copy file name to clipboardExpand all lines: Makefile

+6-47Lines changed: 6 additions & 47 deletions

Original file line number	Diff line number	Diff line change
`@@ -295,7 +295,7 @@ v8:`
`295`	`295`	`tools/make-v8.sh $(V8_ARCH).$(BUILDTYPE_LOWER) $(V8_BUILD_OPTIONS)`
`296`	`296`
`297`	`297`	`.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`
`299`	`299`	`$(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) \`
`300`	`300`	`--skip-tests=$(CI_SKIP_TESTS) \`
`301`	`301`	`$(CI_JS_SUITES) \`
`@@ -319,7 +319,6 @@ test: all ## Runs default tests, linters, and builds docs.`
`319`	`319`	`$(MAKE) -s tooltest`
`320`	`320`	`$(MAKE) -s test-doc`
`321`	`321`	`$(MAKE) -s build-addons`
`322`		`- $(MAKE) -s build-abort-tests`
`323`	`322`	`$(MAKE) -s build-js-native-api-tests`
`324`	`323`	`$(MAKE) -s build-node-api-tests`
`325`	`324`	`$(MAKE) -s cctest`
`@@ -328,7 +327,6 @@ test: all ## Runs default tests, linters, and builds docs.`
`328`	`327`	`.PHONY: test-only`
`329`	`328`	`test-only: all ## For a quick test, does not run linter or build docs.`
`330`	`329`	`$(MAKE) build-addons`
`331`		`- $(MAKE) build-abort-tests`
`332`	`330`	`$(MAKE) build-js-native-api-tests`
`333`	`331`	`$(MAKE) build-node-api-tests`
`334`	`332`	`$(MAKE) cctest`
`@@ -338,7 +336,6 @@ test-only: all ## For a quick test, does not run linter or build docs.`
`338`	`336`	# Used by `make coverage-test`
`339`	`337`	`test-cov: all`
`340`	`338`	`$(MAKE) build-addons`
`341`		`- $(MAKE) build-abort-tests`
`342`	`339`	`$(MAKE) build-js-native-api-tests`
`343`	`340`	`$(MAKE) build-node-api-tests`
`344`	`341`	`$(MAKE) cctest`
`@@ -458,31 +455,6 @@ test/node-api/.buildstamp: $(ADDONS_PREREQS) \`
`458`	`455`	`# TODO(bnoordhuis) Force rebuild after gyp or node-gyp update.`
`459`	`456`	`build-node-api-tests: \| $(NODE_EXE) test/node-api/.buildstamp`
`460`	`457`
`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`		`-`
`486`	`458`	`BENCHMARK_NAPI_BINDING_GYPS := $(wildcard benchmark/napi/*/binding.gyp)`
`487`	`459`
`488`	`460`	`BENCHMARK_NAPI_BINDING_SOURCES := \`
`@@ -503,14 +475,12 @@ clear-stalled:`
`503`	`475`	`echo $${PS_OUT} \| xargs kill -9; \`
`504`	`476`	`fi`
`505`	`477`
`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`
`507`	`479`
`508`	`480`	`test-build-js-native-api: all build-js-native-api-tests`
`509`	`481`
`510`	`482`	`test-build-node-api: all build-node-api-tests`
`511`	`483`
`512`		`-test-build-abort: all build-abort-tests`
`513`		`-`
`514`	`484`	`.PHONY: test-all`
`515`	`485`	`test-all: test-build ## Run default tests with both Debug and Release builds.`
`516`	`486`	`$(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`
`523`	`493`	`$(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) test/*`
`524`	`494`
`525`	`495`	`# 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`
`527`	`497`	`CI_JS_SUITES ?= default`
`528`	`498`	`ifeq ($(node_use_openssl), false)`
`529`	`499`	`CI_DOC := doctool`
`@@ -535,7 +505,7 @@ endif`
`535`	`505`	`# Build and test addons without building anything else`
`536`	`506`	`# Related CI job: node-test-commit-arm-fanned`
`537`	`507`	`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`
`539`	`509`	`$(PYTHON) tools/test.py $(PARALLEL_ARGS) -p tap --logfile test.tap \`
`540`	`510`	`--mode=$(BUILDTYPE_LOWER) --flaky-tests=$(FLAKY_TESTS) \`
`541`	`511`	`$(TEST_CI_ARGS) $(CI_NATIVE_SUITES)`
`@@ -557,7 +527,7 @@ test-ci-js: \| clear-stalled`
`557`	`527`	`.PHONY: test-ci`
`558`	`528`	`# Related CI jobs: most CI tests, excluding node-test-commit-arm-fanned`
`559`	`529`	`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`
`561`	`531`	`out/Release/cctest --gtest_output=xml:out/junit/cctest.xml`
`562`	`532`	`$(PYTHON) tools/test.py $(PARALLEL_ARGS) -p tap --logfile test.tap \`
`563`	`533`	`--mode=$(BUILDTYPE_LOWER) --flaky-tests=$(FLAKY_TESTS) \`
`@@ -663,17 +633,8 @@ test-node-api-clean:`
`663`	`633`	`$(RM) -r test/node-api/*/build`
`664`	`634`	`$(RM) test/node-api/.buildstamp`
`665`	`635`
`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`		`-`
`675`	`636`	`.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`
`677`	`638`	`$(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) addons`
`678`	`639`
`679`	`640`	`.PHONY: test-addons-clean`
`@@ -683,7 +644,6 @@ test-addons-clean:`
`683`	`644`	`$(RM) test/addons/.buildstamp test/addons/.docbuildstamp`
`684`	`645`	`$(MAKE) test-js-native-api-clean`
`685`	`646`	`$(MAKE) test-node-api-clean`
`686`		`- $(MAKE) test-abort-clean`
`687`	`647`
`688`	`648`	`test-async-hooks:`
`689`	`649`	`$(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) async-hooks`
`@@ -692,7 +652,6 @@ test-with-async-hooks:`
`692`	`652`	`$(MAKE) build-addons`
`693`	`653`	`$(MAKE) build-js-native-api-tests`
`694`	`654`	`$(MAKE) build-node-api-tests`
`695`		`- $(MAKE) build-abort-tests`
`696`	`655`	`$(MAKE) cctest`
`697`	`656`	`NODE_TEST_WITH_ASYNC_HOOKS=1 $(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) \`
`698`	`657`	`$(CI_JS_SUITES) \`

Collapse file

`‎vcbuild.bat‎`

Copy file name to clipboardExpand all lines: vcbuild.bat

+4-26Lines changed: 4 additions & 26 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,11 +16,11 @@ if /i "%1"=="/?" goto help`
`16`	`16`	`cd %~dp0`
`17`	`17`
`18`	`18`	`@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`
`20`	`20`	`set CI_JS_SUITES=default`
`21`	`21`	`set CI_DOC=doctool`
`22`	`22`	`@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"`
`24`	`24`
`25`	`25`	`@rem Process arguments.`
`26`	`26`	`set config=Release`
`@@ -68,7 +68,6 @@ set openssl_no_asm=`
`68`	`68`	`set doc=`
`69`	`69`	`set extra_msbuild_args=`
`70`	`70`	`set exit_code=0`
`71`		`-set build_aborts_tests=`
`72`	`71`
`73`	`72`	`:next-arg`
`74`	`73`	`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 -`
`97`	`96`	`if /i "%1"=="build-addons" set build_addons=1&goto arg-ok`
`98`	`97`	`if /i "%1"=="build-js-native-api-tests" set build_js_native_api_tests=1&goto arg-ok`
`99`	`98`	`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`
`102`	`99`	`if /i "%1"=="test-addons" set test_args=%test_args% addons&set build_addons=1&goto arg-ok`
`103`	`100`	`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`
`104`	`101`	`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`
`588`	`585`	`goto build-node-api-tests`
`589`	`586`
`590`	`587`	`: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`
`592`	`589`	`if not exist "%node_exe%" (`
`593`	`590`	`echo Failed to find node.exe`
`594`		`- goto build-abort-tests`
	`591`	`+ goto run-tests`
`595`	`592`	`)`
`596`	`593`	`echo Building node-api`
`597`	`594`	`:: clear`
`@@ -604,25 +601,6 @@ set npm_config_nodedir=%~dp0`
`604`	`601`	`"%node_exe%" "%~dp0tools\build-addons.js" "%~dp0deps\npm\node_modules\node-gyp\bin\node-gyp.js" "%~dp0test\node-api"`
`605`	`602`	`if errorlevel 1 exit /b 1`
`606`	`603`	`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`
`626`	`604`	`goto run-tests`
`627`	`605`
`628`	`606`	`:run-tests`

0 commit comments

Comments

0 (0)

You are visitor 01402503 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.