Dynamic socket buffers make tests unreliable, set fixed buffer size.

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 88d82ac..b89a9e2 100644 (file)
--- 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 4394efc..22c4eb7 100644 (file)
--- 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 68330ce..65ed3a4 100644 (file)
--- 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 2887826..ebeeb65 100644 (file)
--- 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 31cd885..621cd5e 100644 (file)
--- 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 ee4765f..d624bc8 100644 (file)
--- 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 5f31d87..37f2d90 100644 (file)
--- 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 2654c07..8f74a76 100644 (file)
--- 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 9ca1e2f..ec29896 100644 (file)
--- 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 9b8ae66..d1ef549 100644 (file)
--- 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,