From baaf24aceab851c6db75a5f497e64d1ae0f85c6b Mon Sep 17 00:00:00 2001
From: Thiago de Arruda <tpadilha84@gmail.com>
Date: Wed, 26 Feb 2014 16:16:54 -0300
Subject: [PATCH] Add valgrind suppression file

---
 .valgrind.supp       |  7 +++++++
 Makefile             |  4 ++--
 scripts/travis.sh    |  2 +-
 src/testdir/Makefile | 10 +++++-----
 4 files changed, 15 insertions(+), 8 deletions(-)
 create mode 100644 .valgrind.supp

diff --git a/.valgrind.supp b/.valgrind.supp
new file mode 100644
index 0000000000..a0a96518ba
--- /dev/null
+++ b/.valgrind.supp
@@ -0,0 +1,7 @@
+{
+   nss_parse_service_list
+   Memcheck:Leak
+   fun:malloc
+   fun:nss_parse_service_list
+   fun:__nss_database_lookup
+}
diff --git a/Makefile b/Makefile
index d724816e12..3aa82fa0bf 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,9 @@
 -include local.mk
 
-CMAKE_FLAGS = -DCMAKE_BUILD_TYPE=Debug -DCMAKE_PREFIX_PATH=.deps/usr -DLibUV_USE_STATIC=YES
+CMAKE_FLAGS := -DCMAKE_BUILD_TYPE=Debug -DCMAKE_PREFIX_PATH=.deps/usr -DLibUV_USE_STATIC=YES
 
 # Extra CMake flags which extend the default set
-CMAKE_EXTRA_FLAGS =
+CMAKE_EXTRA_FLAGS :=
 
 build/bin/nvim: deps
 	${MAKE} -C build
diff --git a/scripts/travis.sh b/scripts/travis.sh
index 3eb2223fa1..60ed5c0d36 100755
--- a/scripts/travis.sh
+++ b/scripts/travis.sh
@@ -3,5 +3,5 @@
 # export VALGRIND_CHECK=1
 make cmake CMAKE_EXTRA_FLAGS="-DCMAKE_INSTALL_PREFIX=$PWD/dist"
 make
-make test
+make test > /dev/null 2>&1
 make install
diff --git a/src/testdir/Makefile b/src/testdir/Makefile
index 663abffff9..1bf6f74ef8 100644
--- a/src/testdir/Makefile
+++ b/src/testdir/Makefile
@@ -2,9 +2,9 @@
 # Makefile to run all tests for Vim
 #
 
-VIMPROG = ../../build/bin/nvim
+VIMPROG := ../../build/bin/nvim
 
-SCRIPTS = test1.out test2.out test3.out test4.out test5.out test6.out \
+SCRIPTS := test1.out test2.out test3.out test4.out test5.out test6.out \
 		test7.out test8.out test9.out test10.out test11.out \
 		test12.out test13.out test14.out test15.out test17.out \
 		test18.out test19.out test20.out test21.out test22.out \
@@ -25,14 +25,14 @@ SCRIPTS = test1.out test2.out test3.out test4.out test5.out test6.out \
 		test94.out test95.out test96.out test97.out test98.out \
 		test99.out test100.out test101.out test102.out test103.out
 
-SCRIPTS_GUI = test16.out
+SCRIPTS_GUI := test16.out
 
 ifdef VALGRIND_CHECK
-VALGRIND := valgrind --leak-check=yes --error-exitcode=1 --log-file=valgrind.$*
+VALGRIND = valgrind --suppressions=../../.valgrind.supp --leak-check=yes --error-exitcode=1 --log-file=valgrind.$*
 endif
 
 ifdef TESTNUM
-SCRIPTS = test$(TESTNUM).out
+SCRIPTS := test$(TESTNUM).out
 endif
 
 .SUFFIXES: .in .out