Skip to content

Commit 7a98008

Browse files
joyeecheungaddaleax
authored andcommitted
build: always use BUILDTYPE binary to run JS tests
PR-URL: #20362 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Richard Lau <[email protected]> Reviewed-By: Ruben Bridgewater <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Trivikram Kamat <[email protected]>
1 parent 4c6bfbd commit 7a98008

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

Makefile

+14-14
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ v8:
234234

235235
.PHONY: jstest
236236
jstest: build-addons build-addons-napi ## Runs addon tests and JS tests
237-
$(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=release \
237+
$(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) \
238238
$(CI_JS_SUITES) \
239239
$(CI_NATIVE_SUITES)
240240

@@ -269,13 +269,13 @@ test-cov: all
269269
$(MAKE) lint
270270

271271
test-parallel: all
272-
$(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=release parallel
272+
$(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) parallel
273273

274274
test-valgrind: all
275-
$(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=release --valgrind sequential parallel message
275+
$(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) --valgrind sequential parallel message
276276

277277
test-check-deopts: all
278-
$(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=release --check-deopts parallel sequential
278+
$(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) --check-deopts parallel sequential
279279

280280
benchmark/misc/function_call/build/Release/binding.node: all \
281281
benchmark/misc/function_call/binding.cc \
@@ -398,7 +398,7 @@ clear-stalled:
398398

399399
.PHONY: test-gc
400400
test-gc: all test/gc/build/Release/binding.node
401-
$(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=release gc
401+
$(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) gc
402402

403403
.PHONY: test-gc-clean
404404
test-gc-clean:
@@ -425,15 +425,15 @@ CI_DOC := doctool
425425
test-ci-native: LOGLEVEL := info
426426
test-ci-native: | test/addons/.buildstamp test/addons-napi/.buildstamp
427427
$(PYTHON) tools/test.py $(PARALLEL_ARGS) -p tap --logfile test.tap \
428-
--mode=release --flaky-tests=$(FLAKY_TESTS) \
428+
--mode=$(BUILDTYPE_LOWER) --flaky-tests=$(FLAKY_TESTS) \
429429
$(TEST_CI_ARGS) $(CI_NATIVE_SUITES)
430430

431431
.PHONY: test-ci-js
432432
# This target should not use a native compiler at all
433433
# Related CI job: node-test-commit-arm-fanned
434434
test-ci-js: | clear-stalled
435435
$(PYTHON) tools/test.py $(PARALLEL_ARGS) -p tap --logfile test.tap \
436-
--mode=release --flaky-tests=$(FLAKY_TESTS) \
436+
--mode=$(BUILDTYPE_LOWER) --flaky-tests=$(FLAKY_TESTS) \
437437
$(TEST_CI_ARGS) $(CI_JS_SUITES)
438438
# Clean up any leftover processes, error if found.
439439
ps awwx | grep Release/node | grep -v grep | cat
@@ -448,7 +448,7 @@ test-ci: LOGLEVEL := info
448448
test-ci: | clear-stalled build-addons build-addons-napi doc-only
449449
out/Release/cctest --gtest_output=tap:cctest.tap
450450
$(PYTHON) tools/test.py $(PARALLEL_ARGS) -p tap --logfile test.tap \
451-
--mode=release --flaky-tests=$(FLAKY_TESTS) \
451+
--mode=$(BUILDTYPE_LOWER) --flaky-tests=$(FLAKY_TESTS) \
452452
$(TEST_CI_ARGS) $(CI_JS_SUITES) $(CI_NATIVE_SUITES) $(CI_DOC)
453453
# Clean up any leftover processes, error if found.
454454
ps awwx | grep Release/node | grep -v grep | cat
@@ -475,7 +475,7 @@ run-ci: build-ci
475475
$(MAKE) test-ci
476476

477477
test-release: test-build
478-
$(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=release
478+
$(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER)
479479

480480
test-debug: test-build
481481
$(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=debug
@@ -521,7 +521,7 @@ test-npm-publish: $(NODE_EXE)
521521

522522
.PHONY: test-addons-napi
523523
test-addons-napi: test-build-addons-napi
524-
$(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=release addons-napi
524+
$(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) addons-napi
525525

526526
.PHONY: test-addons-napi-clean
527527
test-addons-napi-clean:
@@ -530,7 +530,7 @@ test-addons-napi-clean:
530530

531531
.PHONY: test-addons
532532
test-addons: test-build test-addons-napi
533-
$(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=release addons
533+
$(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) addons
534534

535535
.PHONY: test-addons-clean
536536
test-addons-clean:
@@ -541,19 +541,19 @@ test-addons-clean:
541541

542542
test-timers:
543543
$(MAKE) --directory=tools faketime
544-
$(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=release timers
544+
$(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) timers
545545

546546
test-timers-clean:
547547
$(MAKE) --directory=tools clean
548548

549549
test-async-hooks:
550-
$(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=release async-hooks
550+
$(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) async-hooks
551551

552552
test-with-async-hooks:
553553
$(MAKE) build-addons
554554
$(MAKE) build-addons-napi
555555
$(MAKE) cctest
556-
NODE_TEST_WITH_ASYNC_HOOKS=1 $(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=release \
556+
NODE_TEST_WITH_ASYNC_HOOKS=1 $(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) \
557557
$(CI_JS_SUITES) \
558558
$(CI_NATIVE_SUITES)
559559

0 commit comments

Comments
 (0)