Commit 7168d0b
build: add embedtest into native suite
Instead of adding a separate command to run the embedtest, since
it's now run by the node binary via tools/test.py and
test/embedding/test-embedding.js, put embedding into the native
suite in test scripts. This helps adding more embedding tests
into the folder and run them automatically without listing them
one by one in the scripts.
PR-URL: #61357
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Stefan Stojanovic <stefan.stojanovic@janeasystems.com>1 parent c9b0dc6 commit 7168d0b
2 files changed
Lines changed: 2 additions & 7 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -301,7 +301,6 @@ coverage-report-js: ## Report JavaScript coverage results. | |||
| 301 | 301 | ||
| 302 | 302 | cctest: all ## Run the C++ tests using the built `cctest` executable. | |
| 303 | 303 | @out/$(BUILDTYPE)/$@ --gtest_filter=$(GTEST_FILTER) | |
| 304 | - '$(OUT_NODE)' ./test/embedding/test-embedding.js | ||
| 305 | 304 | ||
| 306 | 305 | .PHONY: list-gtests | |
| 307 | 306 | list-gtests: ## List all available C++ gtests. | |
@@ -571,7 +570,7 @@ test-all-suites: | clear-stalled test-build bench-addons-build doc-only ## Run a | |||
| 571 | 570 | $(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) test/* | |
| 572 | 571 | ||
| 573 | 572 | JS_SUITES ?= default | |
| 574 | - NATIVE_SUITES ?= addons js-native-api node-api | ||
| 573 | + NATIVE_SUITES ?= addons js-native-api node-api embedding | ||
| 575 | 574 | # CI_* variables should be kept synchronized with the ones in vcbuild.bat | |
| 576 | 575 | CI_NATIVE_SUITES ?= $(NATIVE_SUITES) benchmark | |
| 577 | 576 | CI_JS_SUITES ?= $(JS_SUITES) pummel | |
@@ -613,7 +612,6 @@ test-ci: | clear-stalled bench-addons-build build-addons build-js-native-api-tes | |||
| 613 | 612 | $(PYTHON) tools/test.py $(PARALLEL_ARGS) -p tap --logfile test.tap \ | |
| 614 | 613 | --mode=$(BUILDTYPE_LOWER) --flaky-tests=$(FLAKY_TESTS) \ | |
| 615 | 614 | $(TEST_CI_ARGS) $(CI_JS_SUITES) $(CI_NATIVE_SUITES) $(CI_DOC) | |
| 616 | - '$(OUT_NODE)' ./test/embedding/test-embedding.js | ||
| 617 | 615 | $(info Clean up any leftover processes, error if found.) | |
| 618 | 616 | ps awwx | grep Release/node | grep -v grep | cat | |
| 619 | 617 | @PS_OUT=`ps awwx | grep Release/node | grep -v grep | awk '{print $$1}'`; \ | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -11,7 +11,7 @@ if /i "%arg:~-4%"=="help" goto help | |||
| 11 | 11 | cd %~dp0 | |
| 12 | 12 | ||
| 13 | 13 | set JS_SUITES=default | |
| 14 | - set NATIVE_SUITES=addons js-native-api node-api | ||
| 14 | + set NATIVE_SUITES=addons js-native-api node-api embedding | ||
| 15 | 15 | @rem CI_* variables should be kept synchronized with the ones in Makefile | |
| 16 | 16 | set "CI_NATIVE_SUITES=%NATIVE_SUITES% benchmark" | |
| 17 | 17 | set "CI_JS_SUITES=%JS_SUITES% pummel" | |
@@ -719,9 +719,6 @@ if not exist "%config%\cctest.exe" echo cctest.exe not found. Run "vcbuild test" | |||
| 719 | 719 | echo running 'cctest %cctest_args%' | |
| 720 | 720 | "%config%\cctest" %cctest_args% | |
| 721 | 721 | if %errorlevel% neq 0 set exit_code=%errorlevel% | |
| 722 | - echo running '%node_exe% test\embedding\test-embedding.js' | ||
| 723 | - "%node_exe%" test\embedding\test-embedding.js | ||
| 724 | - if %errorlevel% neq 0 set exit_code=%errorlevel% | ||
| 725 | 722 | :run-test-py | |
| 726 | 723 | echo running 'python tools\test.py %test_args%' | |
| 727 | 724 | python tools\test.py %test_args% | |
0 commit comments