[master] 8aadee2 Compile vas.c into the binheap test-program instead of home-rolling.

[Poul-Henning Kamp]

commit 8aadee2d4da1ece1c11d16171f85b82b20c9abd6
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Sat Nov 18 17:42:54 2017 +0000

    Compile vas.c into the binheap test-program instead of home-rolling.

diff --git a/lib/libvarnish/Makefile.am b/lib/libvarnish/Makefile.am
index 7570fa0..ecd5a6a 100644
--- a/lib/libvarnish/Makefile.am
+++ b/lib/libvarnish/Makefile.am
@@ -44,7 +44,7 @@ TESTS = vnum_c_test binheap
 
 noinst_PROGRAMS = ${TESTS}
 
-binheap_SOURCES = binary_heap.c
+binheap_SOURCES = binary_heap.c vas.c
 binheap_CFLAGS = -DTEST_DRIVER
 
 vnum_c_test_SOURCES = vnum.c vas.c
diff --git a/lib/libvarnish/binary_heap.c b/lib/libvarnish/binary_heap.c
index b19516c..8171a8a 100644
--- a/lib/libvarnish/binary_heap.c
+++ b/lib/libvarnish/binary_heap.c
@@ -463,17 +463,6 @@ binheap_reorder(const struct binheap *bh, unsigned idx)
 
 /* Test driver -------------------------------------------------------*/
 
-void __attribute__((__noreturn__))
-VAS_Fail(const char *func, const char *file, int line,
-    const char *cond, enum vas_e what)
-{
-	fprintf(stderr, "PANIC: %s %s %d %s %d\n",
-		func, file, line, cond, what);
-	abort();
-}
-
-vas_f *VAS_Fail_Func = VAS_Fail;
-
 struct foo {
 	unsigned	magic;
 #define FOO_MAGIC	0x23239823