[master] 03f65b1 Revert "Boolean 101"

Dridi Boukelmoune dridi.boukelmoune at gmail.com
Sat Feb 4 10:10:05 CET 2017


commit 03f65b10995fc2c308e58782f94ee9ca911a789d
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date:   Sat Feb 4 10:08:12 2017 +0100

    Revert "Boolean 101"
    
    This reverts commit cca77006b7787bfcd122d76f033656a5f965ffea.
    
    Sometimes it's not a good idea to fix things before having coffee.

diff --git a/bin/varnishtest/vtc.c b/bin/varnishtest/vtc.c
index 0f501ca..483acff 100644
--- a/bin/varnishtest/vtc.c
+++ b/bin/varnishtest/vtc.c
@@ -504,7 +504,7 @@ cmd_shell_engine(struct vtclog *vl, int ok, const char *cmd,
 	if (WIFSIGNALED(r))
 		vtc_log(vl, 4, "shell_signal = %d", WTERMSIG(r));
 
-	if (ok < 0 && (!WEXITSTATUS(r) || WIFSIGNALED(r)))
+	if (ok < 0 && !WEXITSTATUS(r) && !WIFSIGNALED(r))
 		vtc_fatal(vl, "shell did not fail as expected");
 	else if (ok >= 0 && WEXITSTATUS(r) != ok) {
 		vtc_fatal(vl,



More information about the varnish-commit mailing list