[4.1] ab4cb70 Make -vsl_catchup bail on test-failure or child death

PÃ¥l Hermunn Johansen hermunn at varnish-software.com
Thu Jun 15 15:59:10 CEST 2017


commit ab4cb7074ad8d549a0c64082e4006e580e485e31
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Thu Mar 23 20:08:51 2017 +0000

    Make -vsl_catchup bail on test-failure or child death

diff --git a/bin/varnishtest/vtc_varnish.c b/bin/varnishtest/vtc_varnish.c
index 98c15cc..24677b3 100644
--- a/bin/varnishtest/vtc_varnish.c
+++ b/bin/varnishtest/vtc_varnish.c
@@ -193,7 +193,7 @@ vsl_catchup(const struct varnish *v)
 	int vsl_idle;
 
 	vsl_idle = v->vsl_idle;
-	while (vsl_idle == v->vsl_idle)
+	while (!vtc_error && v->pid && vsl_idle == v->vsl_idle)
 		VTIM_sleep(0.1);
 }
 



More information about the varnish-commit mailing list