[master] 416e3bf6e Ignore leaks in the binheap test for now

Federico G. Schwindt fgsch at lodoss.net
Mon Mar 16 11:29:07 UTC 2020


commit 416e3bf6ea15ff9cca48abc20cf057189bbf0f94
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date:   Mon Mar 16 11:27:32 2020 +0000

    Ignore leaks in the binheap test for now

diff --git a/lib/libvarnish/binary_heap.c b/lib/libvarnish/binary_heap.c
index 0079efe1d..f77b63d9c 100644
--- a/lib/libvarnish/binary_heap.c
+++ b/lib/libvarnish/binary_heap.c
@@ -46,6 +46,10 @@
 #include "vas.h"
 #include "binary_heap.h"
 
+#if !defined(__has_feature)
+#define __has_feature(x)	0
+#endif
+
 /* Parameters --------------------------------------------------------*/
 
 /*
@@ -526,6 +530,14 @@ vrnd_lock(void)
 {
 }
 
+#if defined(__SANITIZER) || __has_feature(address_sanitizer)
+int __lsan_is_turned_off(void);
+int __lsan_is_turned_off(void)
+{
+	return (1);
+}
+
+#endif
 int
 main(void)
 {
diff --git a/tools/lsan.suppr b/tools/lsan.suppr
index cc58dd207..4e9892357 100644
--- a/tools/lsan.suppr
+++ b/tools/lsan.suppr
@@ -10,7 +10,6 @@ leak:VSL_Setup
 leak:WRK_BgThread
 #
 leak:binheap_new
-leak:binheap_insert
 # ev
 leak:mct_callback
 #


More information about the varnish-commit mailing list