Fixes for probably outdated Valgrind on Travis

pkubowicz · Mar 19, 2016 · 7b5ad0d · 7b5ad0d
1 parent ac71d31
commit 7b5ad0d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -5,4 +5,6 @@ compiler:
 before_install:
   - sudo apt-get -qq update
   - sudo apt-get install -y flex valgrind
+  - flex --version
+  - valgrind --version
 script: make && ./test.pl --valgrind
diff --git a/test.pl b/test.pl
@@ -41,7 +41,7 @@ sub execute_cmd {
 sub get_cmd {
 	my ($cmd) = @_;
 	if ($ARGV[0] && $ARGV[0] eq '--valgrind') {
-		$cmd = "valgrind --leak-check=yes --leak-check=full --show-leak-kinds=all --error-exitcode=1 $cmd";
+		$cmd = "valgrind --leak-check=yes --leak-check=full --error-exitcode=1 $cmd";
 	}
 	return $cmd;
 }
diff --git a/valgrind.sh b/valgrind.sh
@@ -1,5 +1,6 @@
 #!/bin/sh
 
+export VALGRIND_OPTS="--show-leak-kinds=all"
 make clean all CFLAGS='-ansi -pedantic -Wall -g -O0'
 ./test.pl --valgrind
 make clean