Commit 28db9f216da1da7955118a80c6eacaf7bf5dfac9

Vicent Martí 2013-01-25T20:35:03

Merge pull request #1281 from phkelley/valgrind Improve valgrind suppressions

diff --git a/.travis.yml b/.travis.yml
index 32b1446..f0fd51c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,13 +33,13 @@ script:
 
 # Run Tests
 after_success:
- - valgrind --leak-check=full --show-reachable=yes --suppressions=../libgit2_clar.supp ./libgit2_clar -ionline
+ - valgrind --num-callers=30 --leak-check=full --show-reachable=yes --suppressions=../libgit2_clar.supp ./libgit2_clar -ionline
 
 # Only watch the development branch
 branches:
  only:
    - development
-   
+
 # Notify development list when needed
 notifications:
  irc:
diff --git a/libgit2_clar.supp b/libgit2_clar.supp
index b0c9c68..8942fec 100644
--- a/libgit2_clar.supp
+++ b/libgit2_clar.supp
@@ -1,22 +1,44 @@
 {
-        ignore-zlib-errors-cond
-        Memcheck:Cond
-        obj:*libz.so*
+	ignore-zlib-errors-cond
+	Memcheck:Cond
+	obj:*libz.so*
 }
 
 {
-        ignore-giterr-set-leak
-        Memcheck:Leak
-        ...
-        fun:giterr_set
+	ignore-giterr-set-leak
+	Memcheck:Leak
+	...
+	fun:giterr_set
+}
+
+{
+	ignore-git-global-state-leak
+	Memcheck:Leak
+	...
+	fun:git__global_state
 }
 
 {
+	ignore-openssl-ssl-leak
+	Memcheck:Leak
 	...
 	obj:*libssl.so*
+	...
+	fun:ssl_setup
 }
 
 {
+	ignore-openssl-crypto-leak
+	Memcheck:Leak
 	...
 	obj:*libcrypto.so*
+	...
+	fun:ssl_setup
+}
+
+{
+	ignore-openssl-crypto-cond
+	Memcheck:Cond
+	obj:*libcrypto.so*
+	...
 }