aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorEvan Huus <eapache@gmail.com>2013-02-14 16:07:25 +0000
committerEvan Huus <eapache@gmail.com>2013-02-14 16:07:25 +0000
commit5071e8b6277238631c2123e1c56f31c0658bc61d (patch)
tree527e16e31374196fbab46c53e2ead1508d870cc0 /tools
parentc3c6ebe6c0f1a9b4ebc33b19509895abc88178d1 (diff)
Add an option for bypassing the wmem slab similar to the one for
bypassing the emem slab, to aid in debugging with valgrind. svn path=/trunk/; revision=47656
Diffstat (limited to 'tools')
-rwxr-xr-xtools/test-common.sh1
-rwxr-xr-xtools/valgrind-wireshark.sh1
2 files changed, 2 insertions, 0 deletions
diff --git a/tools/test-common.sh b/tools/test-common.sh
index ee56b6e0ee..faa0155792 100755
--- a/tools/test-common.sh
+++ b/tools/test-common.sh
@@ -67,6 +67,7 @@ export WIRESHARK_EP_VERIFY_POINTERS=
export WIRESHARK_SE_VERIFY_POINTERS=
# Use the Wmem strict allocator which does canaries and scrubbing etc.
export WIRESHARK_DEBUG_WMEM_OVERRIDE=strict
+export WIRESHARK_DEBUG_WMEM_SLAB=
# Turn on GLib memory debugging (since 2.13)
export G_SLICE=debug-blocks
diff --git a/tools/valgrind-wireshark.sh b/tools/valgrind-wireshark.sh
index bd7a3d975a..d465148d61 100755
--- a/tools/valgrind-wireshark.sh
+++ b/tools/valgrind-wireshark.sh
@@ -80,6 +80,7 @@ fi
export WIRESHARK_DEBUG_EP_NO_CHUNKS=
export WIRESHARK_DEBUG_SE_NO_CHUNKS=
export WIRESHARK_DEBUG_WMEM_OVERRIDE=simple
+export WIRESHARK_DEBUG_WMEM_SLAB=
export WIRESHARK_DEBUG_USE_SLICES=
export G_SLICE=always-malloc # or debug-blocks