[master] 45db094 Change subtest 2 to be CTRL-D

Poul-Henning Kamp phk at FreeBSD.org
Thu Jan 11 12:31:06 UTC 2018


commit 45db0940802055092355ee9e43275315e43387df
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Thu Jan 11 12:29:58 2018 +0000

    Change subtest 2 to be CTRL-D

diff --git a/bin/varnishtest/tests/u00000.vtc b/bin/varnishtest/tests/u00000.vtc
index b590e67..b6b4df3 100644
--- a/bin/varnishtest/tests/u00000.vtc
+++ b/bin/varnishtest/tests/u00000.vtc
@@ -11,7 +11,7 @@ shell "test -f ${p1_err} -a ! -s ${p1_err}"
 process p2 -log "cat" -start
 process p2 -writeln "bar"
 delay 0.5
-process p2 -close
+process p2 -write "\x04"
 process p2 -wait
 shell "grep -q bar ${p2_out}"
 shell "test -f ${p2_err} -a ! -s ${p2_err}"
diff --git a/bin/varnishtest/vtc_process.c b/bin/varnishtest/vtc_process.c
index c11799f..d7b94e6 100644
--- a/bin/varnishtest/vtc_process.c
+++ b/bin/varnishtest/vtc_process.c
@@ -337,6 +337,7 @@ process_init_term(struct process *p, int fd)
 	tt.c_cc[VMIN] = 1;
 
 	i = tcsetattr(fd, TCSAFLUSH, &tt);
+	if (i)
 		vtc_log(p->vl, 4, "TCSAFLUSH %d %s", i, strerror(errno));
 }
 


More information about the varnish-commit mailing list