[master] 2ed5a02 Try to get Solaris to work again.
Poul-Henning Kamp
phk at FreeBSD.org
Sat Jan 13 10:41:09 UTC 2018
commit 2ed5a020121a90bc862e9ea291c4fd6c871568b5
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date: Sat Jan 13 10:40:02 2018 +0000
Try to get Solaris to work again.
diff --git a/bin/varnishtest/tests/u00000.vtc b/bin/varnishtest/tests/u00000.vtc
index 99bf22a..1af8263 100644
--- a/bin/varnishtest/tests/u00000.vtc
+++ b/bin/varnishtest/tests/u00000.vtc
@@ -1,5 +1,9 @@
varnishtest "Simple process tests"
+process p6 "ps -lw | grep '[p][s]' ; tty ; sleep 1" -run -screen_dump
+
+process p5 "stty -a ; sleep 1" -run -screen_dump
+
process p1 "cat" -start
process p1 -writeln "foo"
process p1 -need-bytes 3
@@ -30,4 +34,3 @@ process p4 -need-bytes 3
process p4 -kill TERM
process p4 -wait -screen_dump
-process p5 "stty -a ; sleep 1" -run -screen_dump
diff --git a/bin/varnishtest/vtc_process.c b/bin/varnishtest/vtc_process.c
index cf0571a..3d5903d 100644
--- a/bin/varnishtest/vtc_process.c
+++ b/bin/varnishtest/vtc_process.c
@@ -402,7 +402,11 @@ process_start(struct process *p)
AZ(close(STDIN_FILENO));
slave = open(slavename, O_RDWR);
assert(slave == STDIN_FILENO);
+#ifdef __sun
+ (void)ioctl(STDIN_FILENO, TIOCSCTTY, NULL);
+#else
AZ(ioctl(STDIN_FILENO, TIOCSCTTY, NULL));
+#endif
AZ(close(STDOUT_FILENO));
assert(dup2(slave, STDOUT_FILENO) == STDOUT_FILENO);
VSUB_closefrom(STDERR_FILENO + 1);
More information about the varnish-commit
mailing list