From: phk <phk@d4fa192b-c00b-0410-8231-f00ffab90ce4>
Date: Fri, 26 Sep 2008 14:06:52 +0000 (+0000)
Subject: Check for the expected exit status from varnishd
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2daab4460c26c9eec44fb1596a18452c77b6c228;p=varnish

Check for the expected exit status from varnishd



git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@3231 d4fa192b-c00b-0410-8231-f00ffab90ce4
---

diff --git a/varnish-cache/bin/varnishtest/vtc_varnish.c b/varnish-cache/bin/varnishtest/vtc_varnish.c
index 5dd253b3..6c6f1be1 100644
--- a/varnish-cache/bin/varnishtest/vtc_varnish.c
+++ b/varnish-cache/bin/varnishtest/vtc_varnish.c
@@ -306,6 +306,11 @@ varnish_wait(struct varnish *v)
 	AZ(close(v->fds[0]));
 	r = wait4(v->pid, &status, 0, NULL);
 	vtc_log(v->vl, 2, "R %d Status: %04x", r, status);
+	if (WIFEXITED(status) && WEXITSTATUS(status) == 2)
+		return;
+	vtc_log(v->vl, 0, "Bad exit code: %04x sig %x exit %x core %x",
+	    status, WTERMSIG(status), WEXITSTATUS(status),
+	    WCOREDUMP(status));
 }
 
 /**********************************************************************