Skip to content

Commit 120d0dd

Browse files
committed
fixup! build: enable Perfetto by default
add TRACE_PROCESSOR_SHELL_PATH as dependency of JS test
1 parent 4eb3d56 commit 120d0dd

2 files changed

Lines changed: 7 additions & 5 deletions

File tree

‎Makefile‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,9 @@ v8: ## Build deps/v8.
321321
tools/make-v8.sh $(V8_ARCH).$(BUILDTYPE_LOWER) $(V8_BUILD_OPTIONS)
322322

323323
.PHONY: jstest
324-
jstest: build-addons build-js-native-api-tests build-node-api-tests build-sqlite-tests build-ffi-tests ## Run addon tests and JS tests.
324+
## Run addon tests and JS tests.
325+
jstest: build-addons build-js-native-api-tests build-node-api-tests build-sqlite-tests build-ffi-tests $(TRACE_PROCESSOR_SHELL_PATH))
326+
@out/$(BUILDTYPE)/cctest --gtest_list_tests
325327
$(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) \
326328
$(TEST_CI_ARGS) \
327329
--skip-tests=$(CI_SKIP_TESTS) \
@@ -348,8 +350,10 @@ ifeq ($(TRACE_PROCESSOR_SHELL_PATH),tools/perfetto/trace_processor_shell)
348350
TRACE_PROCESSOR_SHELL_DEPS = deps/perfetto/VERSION
349351
endif
350352

353+
ifneq (/dev/null,$(TRACE_PROCESSOR_SHELL_PATH))
351354
$(TRACE_PROCESSOR_SHELL_PATH): $(TRACE_PROCESSOR_SHELL_DEPS)
352355
@tools/perfetto/get_trace_processor $@
356+
endif
353357

354358
.PHONY: test
355359
# This does not run tests of third-party libraries inside deps.
@@ -655,7 +659,7 @@ test-ci-js: | clear-stalled ## Build and test JavaScript with building anything
655659
.PHONY: test-ci
656660
# Related CI jobs: most CI tests, excluding node-test-commit-arm-fanned
657661
test-ci: LOGLEVEL := info ## Build and test everything (CI).
658-
test-ci: | clear-stalled bench-addons-build build-addons build-js-native-api-tests build-node-api-tests build-sqlite-tests build-ffi-tests doc-only
662+
test-ci: | clear-stalled bench-addons-build build-addons build-js-native-api-tests build-node-api-tests build-sqlite-tests build-ffi-tests doc-only $(TRACE_PROCESSOR_SHELL_PATH)
659663
out/Release/cctest --gtest_output=xml:out/junit/cctest.xml
660664
$(PYTHON) tools/test.py $(PARALLEL_ARGS) -p tap --logfile test.tap \
661665
--mode=$(BUILDTYPE_LOWER) --flaky-tests=$(FLAKY_TESTS) \

‎shell.nix‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,7 @@ pkgs.mkShell {
144144
)
145145
)
146146
);
147+
TRACE_PROCESSOR_SHELL_PATH = if withPerfetto then "${pkgs.perfetto.tools}/bin/trace_processor_shell" else "/dev/null";
147148
}
148149
// (
149150
let
@@ -172,9 +173,6 @@ pkgs.mkShell {
172173
// pkgs.lib.optionalAttrs (!withSQLite) {
173174
NOSQLITE = "1";
174175
}
175-
// pkgs.lib.optionalAttrs (withPerfetto) {
176-
TRACE_PROCESSOR_SHELL_PATH = "${pkgs.perfetto.tools}/bin/trace_processor_shell";
177-
}
178176
// pkgs.lib.optionalAttrs (pkcs11 != false && pkcs11 != null) (
179177
let
180178
pkcs11' =

0 commit comments

Comments
 (0)