Skip to content

Commit a776466

Browse files
committed
Add $(RUN) for valgrind/callgrind, add dedicated callgrind-test target
1 parent 511c1f4 commit a776466

File tree

1 file changed

+12
-6
lines changed

1 file changed

+12
-6
lines changed

Makefile

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,8 @@ repl: $(JANET_TARGET)
269269
debug: $(JANET_TARGET)
270270
$(DEBUGGER) ./$(JANET_TARGET)
271271

272-
VALGRIND_COMMAND=valgrind --leak-check=full --quiet
272+
VALGRIND_COMMAND=$(RUN) valgrind --leak-check=full --quiet
273+
CALLGRIND_COMMAND=$(RUN) valgrind --tool=callgrind
273274

274275
valgrind: $(JANET_TARGET)
275276
$(VALGRIND_COMMAND) ./$(JANET_TARGET)
@@ -280,10 +281,14 @@ test: $(JANET_TARGET) $(TEST_SCRIPTS) $(EXAMPLE_SCRIPTS)
280281

281282
valtest: $(JANET_TARGET) $(TEST_SCRIPTS) $(EXAMPLE_SCRIPTS)
282283
for f in test/suite*.janet; do $(VALGRIND_COMMAND) ./$(JANET_TARGET) "$$f" || exit; done
283-
for f in examples/*.janet; do ./$(JANET_TARGET) -k "$$f"; done
284+
for f in examples/*.janet; do $(VALGRIND_COMMAND) ./$(JANET_TARGET) -k "$$f"; done
284285

285-
callgrind: $(JANET_TARGET) $(TEST_SCRIPTS)
286-
for f in test/suite*.janet; do valgrind --tool=callgrind ./$(JANET_TARGET) "$$f" || exit; done
286+
callgrind: $(JANET_TARGET)
287+
$(CALLGRIND_COMMAND) ./$(JANET_TARGET)
288+
289+
calltest: $(JANET_TARGET) $(TEST_SCRIPTS) $(EXAMPLE_SCRIPTS)
290+
for f in test/suite*.janet; do $(CALLGRIND_COMMAND) ./$(JANET_TARGET) "$$f" || exit; done
291+
for f in examples/*.janet; do $(CALLGRIND_COMMAND) ./$(JANET_TARGET) -k "$$f"; done
287292

288293
########################
289294
##### Distribution #####
@@ -425,7 +430,8 @@ help:
425430
@echo ' make test Test a built Janet'
426431
@echo ' make valgrind Assess Janet with Valgrind'
427432
@echo ' make callgrind Assess Janet with Valgrind, using Callgrind'
428-
@echo ' make valtest Run the test suite with Valgrind to check for memory leaks'
433+
@echo ' make valtest Run the test suite and examples with Valgrind to check for memory leaks'
434+
@echo ' make calltest Run the test suite and examples with Callgrind'
429435
@echo ' make dist Create a distribution tarball'
430436
@echo ' make docs Generate documentation'
431437
@echo ' make debug Run janet with GDB or LLDB'
@@ -440,4 +446,4 @@ help:
440446
@echo
441447

442448
.PHONY: clean install install-jpm-git install-spork-git repl debug valgrind test \
443-
valtest dist uninstall docs grammar format help compile-commands
449+
valtest callgrind callgrind-test dist uninstall docs grammar format help compile-commands

0 commit comments

Comments
 (0)