From 64e7b3c52a99e81aaca4e8d8ab7428a073a844c2 Mon Sep 17 00:00:00 2001 From: Joyee Cheung Date: Mon, 12 Jan 2026 19:00:43 +0100 Subject: [PATCH] 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. --- Makefile | 4 +--- vcbuild.bat | 5 +---- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 5afee2318c9bca..b3c8486f7ca3c6 100644 --- a/Makefile +++ b/Makefile @@ -301,7 +301,6 @@ coverage-report-js: ## Report JavaScript coverage results. cctest: all ## Run the C++ tests using the built `cctest` executable. @out/$(BUILDTYPE)/$@ --gtest_filter=$(GTEST_FILTER) - '$(OUT_NODE)' ./test/embedding/test-embedding.js .PHONY: list-gtests 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 $(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) test/* JS_SUITES ?= default -NATIVE_SUITES ?= addons js-native-api node-api +NATIVE_SUITES ?= addons js-native-api node-api embedding # CI_* variables should be kept synchronized with the ones in vcbuild.bat CI_NATIVE_SUITES ?= $(NATIVE_SUITES) benchmark CI_JS_SUITES ?= $(JS_SUITES) pummel @@ -613,7 +612,6 @@ test-ci: | clear-stalled bench-addons-build build-addons build-js-native-api-tes $(PYTHON) tools/test.py $(PARALLEL_ARGS) -p tap --logfile test.tap \ --mode=$(BUILDTYPE_LOWER) --flaky-tests=$(FLAKY_TESTS) \ $(TEST_CI_ARGS) $(CI_JS_SUITES) $(CI_NATIVE_SUITES) $(CI_DOC) - '$(OUT_NODE)' ./test/embedding/test-embedding.js $(info Clean up any leftover processes, error if found.) ps awwx | grep Release/node | grep -v grep | cat @PS_OUT=`ps awwx | grep Release/node | grep -v grep | awk '{print $$1}'`; \ diff --git a/vcbuild.bat b/vcbuild.bat index 18b0f3aa6fdaed..9f324c7e5b8ae0 100644 --- a/vcbuild.bat +++ b/vcbuild.bat @@ -11,7 +11,7 @@ if /i "%arg:~-4%"=="help" goto help cd %~dp0 set JS_SUITES=default -set NATIVE_SUITES=addons js-native-api node-api +set NATIVE_SUITES=addons js-native-api node-api embedding @rem CI_* variables should be kept synchronized with the ones in Makefile set "CI_NATIVE_SUITES=%NATIVE_SUITES% benchmark" set "CI_JS_SUITES=%JS_SUITES% pummel" @@ -736,9 +736,6 @@ if not exist "%config%\cctest.exe" echo cctest.exe not found. Run "vcbuild test" echo running 'cctest %cctest_args%' "%config%\cctest" %cctest_args% if %errorlevel% neq 0 set exit_code=%errorlevel% -echo running '%node_exe% test\embedding\test-embedding.js' -"%node_exe%" test\embedding\test-embedding.js -if %errorlevel% neq 0 set exit_code=%errorlevel% :run-test-py echo running 'python tools\test.py %test_args%' python tools\test.py %test_args%