Merge pull request #1742 from tokkee/sh/suppress

Valgrind: Suppress a bogus invalid read on FreeBSD.

diff --git a/src/valgrind.FreeBSD.suppress b/src/valgrind.FreeBSD.suppress
new file mode 100644 (file)
index 0000000..28ea677
--- /dev/null
+++ b/src/valgrind.FreeBSD.suppress
@@ -0,0 +1,8 @@
+{
+   strlen_bogus_invalid_read_after_strdup
+   Memcheck:Addr4
+   fun:parse_value
+   fun:parse_values
+   fun:test_parse_values
+   fun:main
+}

diff --git a/testwrapper.sh b/testwrapper.sh
index f8593a1..a86705f 100755 (executable)
--- a/testwrapper.sh
+++ b/testwrapper.sh
@@ -14,6 +14,14 @@ if test -n "$VALGRIND"; then
        MEMCHECK="$MEMCHECK --trace-children=yes"
        MEMCHECK="$MEMCHECK --leak-check=full"
        MEMCHECK="$MEMCHECK --gen-suppressions=all"
+
+       for f in "valgrind.$( uname -s ).suppress" "valgrind.suppress"; do
+               filename="$( dirname "$0" )/src/$f"
+               if test -e "$filename"; then
+                       # Valgrind supports up to 100 suppression files.
+                       MEMCHECK="$MEMCHECK --suppressions=$filename"
+               fi
+       done
 fi
 
 exec $MEMCHECK "$@"