[master] f185f0a Don't set the VAS handler until the test-executing child process.

[Poul-Henning Kamp]

commit f185f0a455e3e4157ab193c05b4774e66270643f
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Feb 1 23:46:00 2016 +0000

    Don't set the VAS handler until the test-executing child process.

diff --git a/bin/varnishtest/vtc_log.c b/bin/varnishtest/vtc_log.c
index 30ae6b8..9b1ddf0 100644
--- a/bin/varnishtest/vtc_log.c
+++ b/bin/varnishtest/vtc_log.c
@@ -55,19 +55,6 @@ static double t0;
 
 /**********************************************************************/
 
-void
-vtc_loginit(char *buf, unsigned buflen)
-{
-
-	t0 = VTIM_mono();
-	vtclog_buf = buf;
-	vtclog_left = buflen;
-	AZ(pthread_mutex_init(&vtclog_mtx, NULL));
-	AZ(pthread_key_create(&log_key, NULL));
-}
-
-/**********************************************************************/
-
 
 struct vtclog *
 vtc_logopen(const char *id)
@@ -305,4 +292,17 @@ vtc_log_VAS_Fail(const char *func, const char *file, int line,
 	abort();
 }
 
-vas_f *VAS_Fail __attribute__((__noreturn__)) = vtc_log_VAS_Fail;
+/**********************************************************************/
+
+void
+vtc_loginit(char *buf, unsigned buflen)
+{
+
+	VAS_Fail = vtc_log_VAS_Fail;
+	t0 = VTIM_mono();
+	vtclog_buf = buf;
+	vtclog_left = buflen;
+	AZ(pthread_mutex_init(&vtclog_mtx, NULL));
+	AZ(pthread_key_create(&log_key, NULL));
+}
+