[master] f1501b5 try to get more comprehensive core dumps on test timeouts

[Poul-Henning Kamp]

commit f1501b5b1f14b54bff71eb3ec9ea3691a3de04c0
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Thu May 14 08:39:06 2015 +0000

    try to get more comprehensive core dumps on test timeouts

diff --git a/bin/varnishtest/vtc_main.c b/bin/varnishtest/vtc_main.c
index 6a1da82..a2b34e0 100644
--- a/bin/varnishtest/vtc_main.c
+++ b/bin/varnishtest/vtc_main.c
@@ -149,13 +149,10 @@ tst_cb(const struct vev *ve, int what)
 	CAST_OBJ_NOTNULL(jp, ve->priv, JOB_MAGIC);
 
 	// printf("%p %s %d\n", ve, jp->tst->filename, what);
-	if (what == 0) {
-		/* XXX: Timeout */
-		AZ(kill(jp->child, SIGKILL));
-		jp->evt = NULL;
-		return (1);
-	}
-	assert(what & (EV_RD | EV_HUP));
+	if (what == 0)
+		AZ(kill(jp->child, SIGKILL)); /* XXX: Timeout */
+	else
+		assert(what & (EV_RD | EV_HUP));
 
 	*buf = '\0';
 	i = read(ve->fd, buf, sizeof buf - 1);