summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Stancliff <matt@genges.com>2015-01-22 15:31:43 -0500
committerMatt Stancliff <matt@genges.com>2015-01-22 16:00:38 -0500
commitdd680fcc14ca2b950fd454577fcf532d58ffa7b5 (patch)
treed2958bb0650269cb5bd7a2a48bd25af7e6daf292
parent3c023ee1572fb4dcbbc526b9c64cf3bc315464db (diff)
Add valgrind to TravisCI testing
-rw-r--r--.travis.yml9
-rw-r--r--Makefile2
2 files changed, 9 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index 030427f..882ded4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,4 +3,11 @@ compiler:
- gcc
- clang
-script: make && make check
+env:
+ - PRE=""
+ - PRE="valgrind --track-origins=yes --leak-check=full"
+
+install:
+ - sudo apt-get install libc6-dbg libc6-dev libc6-i686:i386 libc6-dev-i386 libc6-dbg:i386 valgrind -y
+
+script: make && make check PRE="$PRE"
diff --git a/Makefile b/Makefile
index d79717a..d683aec 100644
--- a/Makefile
+++ b/Makefile
@@ -128,7 +128,7 @@ test: hiredis-test
check: hiredis-test
@echo "$$REDIS_TEST_CONFIG" | $(REDIS_SERVER) -
- ./hiredis-test -h 127.0.0.1 -p $(REDIS_PORT) -s /tmp/hiredis-test-redis.sock || \
+ $(PRE) ./hiredis-test -h 127.0.0.1 -p $(REDIS_PORT) -s /tmp/hiredis-test-redis.sock || \
( kill `cat /tmp/hiredis-test-redis.pid` && false )
kill `cat /tmp/hiredis-test-redis.pid`