Merge pull request #295 from omasanori/valgrind

Test with Valgrind

.travis.yml

@@ -7,12 +7,14 @@ addons:
   apt:
     packages:
       - gcc-multilib
+#     - valgrind
 env:
   - CFLAGS="-m32"
   - CFLAGS="-m64"
 script:
   - perl --version
   - make test
+# - make test-contrib TEST_RUNNER="valgrind -q --leak-check=full --dsymutil=yes --error-exitcode=1 bin/picrin"
   - make clean
   - make debug
   - make test

Makefile

@@ -15,6 +15,8 @@ CONTRIB_INITS =
 CONTRIB_TESTS =
 CONTRIB_DOCS = $(wildcard contrib/*/docs/*.rst)
 
+TEST_RUNNER = bin/picrin
+
 CFLAGS += -I./extlib/benz/include -Wall -Wextra
 LDFLAGS += -lm
 
@@ -23,11 +25,11 @@ prefix = /usr/local
 all: CFLAGS += -O2 -DNDEBUG=1
 all: bin/picrin
 
-include $(sort $(wildcard contrib/*/nitro.mk))
-
 debug: CFLAGS += -O0 -g
 debug: bin/picrin
 
+include $(sort $(wildcard contrib/*/nitro.mk))
+
 bin/picrin: $(PICRIN_OBJS) $(CONTRIB_OBJS) lib/libbenz.a
 	$(CC) $(CFLAGS) -o $@ $(PICRIN_OBJS) $(CONTRIB_OBJS) lib/libbenz.a $(LDFLAGS)
 

contrib/10.macro/nitro.mk

@@ -3,4 +3,4 @@ CONTRIB_LIBS += $(wildcard contrib/10.macro/*.scm)
 CONTRIB_TESTS += test-macro
 
 test-macro: bin/picrin
-	bin/picrin contrib/10.macro/t/ir-macro.scm
+	$(TEST_RUNNER) contrib/10.macro/t/ir-macro.scm

contrib/20.r7rs/nitro.mk

@@ -27,5 +27,5 @@ CONTRIB_TESTS += test-r7rs
 
 test-r7rs: bin/picrin
 	for test in `ls contrib/20.r7rs/t/*.scm`; do \
-	  bin/picrin "$$test"; \
+	  $(TEST_RUNNER) "$$test"; \
 	done

contrib/30.optional/nitro.mk

@@ -3,5 +3,5 @@ CONTRIB_TESTS += test-optional
 
 test-optional: bin/picrin
 	for test in `ls contrib/30.optional/t/*.scm`; do \
-	  bin/picrin $$test; \
+	  $(TEST_RUNNER) $$test; \
 	done

contrib/30.random/nitro.mk

@@ -4,5 +4,5 @@ CONTRIB_TESTS += test-random
 
 test-random: bin/picrin
 	for test in `ls contrib/30.random/t/*.scm`; do \
-	  bin/picrin $$test; \
+	  $(TEST_RUNNER) $$test; \
 	done

contrib/30.readline/nitro.mk

@@ -12,5 +12,5 @@ contrib/src/readline.o: contrib/src/readline.c
 
 test-readline: bin/picrin
 	for test in `ls contrib/30.readline/t/*.scm`; do \
-	  bin/picrin $$test; \
+	  $(TEST_RUNNER) $$test; \
 	done

contrib/30.regexp/nitro.mk

@@ -4,5 +4,5 @@ CONTRIB_TESTS += test-regexp
 
 test-regexp: bin/picrin
 	for test in `ls contrib/30.regexp/t/*.scm`; do \
-	  bin/picrin $$test; \
+	  $(TEST_RUNNER) $$test; \
 	done

contrib/40.srfi/nitro.mk

@@ -19,5 +19,5 @@ CONTRIB_TESTS += test-srfi
 
 test-srfi: bin/picrin
 	for test in `ls contrib/40.srfi/t/*.scm`; do \
-	  bin/picrin "$$test"; \
+	  $(TEST_RUNNER) "$$test"; \
 	done

contrib/50.for/nitro.mk

@@ -3,5 +3,5 @@ CONTRIB_TESTS += test-for
 
 test-for: bin/picrin
 	for test in `ls contrib/50.for/t/*.scm`; do \
-	  bin/picrin "$$test"; \
+	  $(TEST_RUNNER) "$$test"; \
 	done

contrib/90.array/nitro.mk

@@ -3,4 +3,4 @@ CONTRIB_LIBS += $(wildcard contrib/90.array/*.scm)
 CONTRIB_TESTS += test-array
 
 test-array: bin/picrin
-	bin/picrin contrib/90.array/t/array.scm
+	$(TEST_RUNNER) contrib/90.array/t/array.scm