summaryrefslogtreecommitdiff
path: root/regress
diff options
context:
space:
mode:
authorAlexander Bluhm <bluhm@cvs.openbsd.org>2021-05-07 19:00:35 +0000
committerAlexander Bluhm <bluhm@cvs.openbsd.org>2021-05-07 19:00:35 +0000
commitd3409f7fb4a2ba33226d6b219bbcc9ed2dcb0d31 (patch)
treef639b197c8c1c4053bd3c517e3c79de683489f09 /regress
parentf5eeaf373b1b683f5a146cb395144eacfe1e7f7a (diff)
Dynamic socket buffers make tests unreliable, set fixed buffer size.
Diffstat (limited to 'regress')
-rw-r--r--regress/sys/kern/sosplice/tcp/args-max-sleep-relay.pl2
-rw-r--r--regress/sys/kern/sosplice/tcp/args-relay-read-eof.pl2
-rw-r--r--regress/sys/kern/sosplice/tcp/args-reset-sleep-server.pl2
-rw-r--r--regress/sys/kern/sosplice/tcp/args-reset.pl3
-rw-r--r--regress/sys/kern/sosplice/tcp/args-server-abort.pl1
-rw-r--r--regress/sys/kern/sosplice/tcp/args-smallbuf-sleep-server.pl1
-rw-r--r--regress/sys/kern/sosplice/tcp/args-smallbuf.pl2
-rw-r--r--regress/sys/kern/sosplice/tcp/args-smallrcv-sleep-server.pl1
-rw-r--r--regress/sys/kern/sosplice/tcp/args-smallsnd-sleep-server.pl1
-rw-r--r--regress/sys/kern/sosplice/tcp/args-unsplice-forked.pl4
10 files changed, 15 insertions, 4 deletions
diff --git a/regress/sys/kern/sosplice/tcp/args-max-sleep-relay.pl b/regress/sys/kern/sosplice/tcp/args-max-sleep-relay.pl
index 88d82ac5759..b89a9e2ee63 100644
--- a/regress/sys/kern/sosplice/tcp/args-max-sleep-relay.pl
+++ b/regress/sys/kern/sosplice/tcp/args-max-sleep-relay.pl
@@ -8,12 +8,14 @@ our %args = (
client => {
func => sub { errignore(@_); write_stream(@_); },
len => 2**17,
+ sndbuf => 2**15,
down => "Client print failed: Broken pipe",
nocheck => 1,
},
relay => {
func => sub { sleep 3; relay(@_); shutin(@_); sleep 1; },
max => 32117,
+ rcvbuf => 2**15,
big => 1,
},
len => 32117,
diff --git a/regress/sys/kern/sosplice/tcp/args-relay-read-eof.pl b/regress/sys/kern/sosplice/tcp/args-relay-read-eof.pl
index 4394efca336..22c4eb72000 100644
--- a/regress/sys/kern/sosplice/tcp/args-relay-read-eof.pl
+++ b/regress/sys/kern/sosplice/tcp/args-relay-read-eof.pl
@@ -12,8 +12,8 @@ our %args = (
relay => {
nonblocking => 1,
readblocking => 1,
- sndbuf => 2**12,
rcvbuf => 2**12,
+ sndbuf => 2**12,
},
server => {
# wait until all buffers are filled and client sends eof
diff --git a/regress/sys/kern/sosplice/tcp/args-reset-sleep-server.pl b/regress/sys/kern/sosplice/tcp/args-reset-sleep-server.pl
index 68330ce5413..65ed3a45874 100644
--- a/regress/sys/kern/sosplice/tcp/args-reset-sleep-server.pl
+++ b/regress/sys/kern/sosplice/tcp/args-reset-sleep-server.pl
@@ -8,6 +8,7 @@ our %args = (
alarm => 1,
func => sub { solingerout(@_); write_stream(@_); },
len => 2**19,
+ sndbuf => 2**15,
nocheck => 1,
},
relay => {
@@ -19,6 +20,7 @@ our %args = (
},
server => {
func => sub { sleep 3; read_stream(@_); },
+ rcvbuf => 2**15,
nocheck => 1,
},
len => 131072,
diff --git a/regress/sys/kern/sosplice/tcp/args-reset.pl b/regress/sys/kern/sosplice/tcp/args-reset.pl
index 2887826468c..ebeeb65a304 100644
--- a/regress/sys/kern/sosplice/tcp/args-reset.pl
+++ b/regress/sys/kern/sosplice/tcp/args-reset.pl
@@ -7,11 +7,12 @@ our %args = (
client => {
func => sub { errignore(@_); write_stream(@_); },
len => 2**17,
+ sndbuf => 2**15,
},
relay => {
func => sub { errignore(@_); relay(@_); },
- sndbuf => 2**12,
rcvbuf => 2**12,
+ sndbuf => 2**12,
down => "Broken pipe|Connection reset by peer",
},
server => {
diff --git a/regress/sys/kern/sosplice/tcp/args-server-abort.pl b/regress/sys/kern/sosplice/tcp/args-server-abort.pl
index 31cd885d95b..621cd5e8f5d 100644
--- a/regress/sys/kern/sosplice/tcp/args-server-abort.pl
+++ b/regress/sys/kern/sosplice/tcp/args-server-abort.pl
@@ -24,6 +24,7 @@ our %args = (
},
server => {
alarm => 3,
+ rcvbuf => 2**15,
nocheck => 1,
},
noecho => 1,
diff --git a/regress/sys/kern/sosplice/tcp/args-smallbuf-sleep-server.pl b/regress/sys/kern/sosplice/tcp/args-smallbuf-sleep-server.pl
index ee4765ff1b0..d624bc84aef 100644
--- a/regress/sys/kern/sosplice/tcp/args-smallbuf-sleep-server.pl
+++ b/regress/sys/kern/sosplice/tcp/args-smallbuf-sleep-server.pl
@@ -13,6 +13,7 @@ our %args = (
},
server => {
func => sub { sleep 3; read_stream(@_); },
+ rcvbuf => 2**15,
},
len => 131072,
md5 => "31e5ad3d0d2aeb1ad8aaa847dfa665c2",
diff --git a/regress/sys/kern/sosplice/tcp/args-smallbuf.pl b/regress/sys/kern/sosplice/tcp/args-smallbuf.pl
index 5f31d87eccd..37f2d90fce4 100644
--- a/regress/sys/kern/sosplice/tcp/args-smallbuf.pl
+++ b/regress/sys/kern/sosplice/tcp/args-smallbuf.pl
@@ -8,8 +8,8 @@ our %args = (
len => 2**17,
},
relay => {
- sndbuf => 2**12,
rcvbuf => 2**12,
+ sndbuf => 2**12,
},
len => 131072,
md5 => "31e5ad3d0d2aeb1ad8aaa847dfa665c2",
diff --git a/regress/sys/kern/sosplice/tcp/args-smallrcv-sleep-server.pl b/regress/sys/kern/sosplice/tcp/args-smallrcv-sleep-server.pl
index 2654c07b343..8f74a7666da 100644
--- a/regress/sys/kern/sosplice/tcp/args-smallrcv-sleep-server.pl
+++ b/regress/sys/kern/sosplice/tcp/args-smallrcv-sleep-server.pl
@@ -12,6 +12,7 @@ our %args = (
},
server => {
func => sub { sleep 3; read_stream(@_); },
+ rcvbuf => 2**15,
},
len => 131072,
md5 => "31e5ad3d0d2aeb1ad8aaa847dfa665c2",
diff --git a/regress/sys/kern/sosplice/tcp/args-smallsnd-sleep-server.pl b/regress/sys/kern/sosplice/tcp/args-smallsnd-sleep-server.pl
index 9ca1e2fa0ca..ec29896ca9a 100644
--- a/regress/sys/kern/sosplice/tcp/args-smallsnd-sleep-server.pl
+++ b/regress/sys/kern/sosplice/tcp/args-smallsnd-sleep-server.pl
@@ -12,6 +12,7 @@ our %args = (
},
server => {
func => sub { sleep 3; read_stream(@_); },
+ rcvbuf => 2**15,
},
len => 131072,
md5 => "31e5ad3d0d2aeb1ad8aaa847dfa665c2",
diff --git a/regress/sys/kern/sosplice/tcp/args-unsplice-forked.pl b/regress/sys/kern/sosplice/tcp/args-unsplice-forked.pl
index 9b8ae668353..d1ef5490a75 100644
--- a/regress/sys/kern/sosplice/tcp/args-unsplice-forked.pl
+++ b/regress/sys/kern/sosplice/tcp/args-unsplice-forked.pl
@@ -6,8 +6,9 @@ use POSIX;
our %args = (
client => {
- len => 2**17,
func => sub { errignore(@_); write_stream(@_); },
+ len => 2**17,
+ sndbuf => 2**15,
},
relay => {
func => sub {
@@ -43,6 +44,7 @@ our %args = (
},
server => {
func => sub { sleep 3; read_stream(@_); },
+ rcvbuf => 2**15,
},
noecho => 1,
nocheck => 1,