summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--regress/sys/kern/splice/args-oobinline-nonblock.pl5
-rw-r--r--regress/sys/kern/splice/args-oobinline-reverse-nonblock.pl5
-rw-r--r--regress/sys/kern/splice/args-oobinline-reverse.pl5
-rw-r--r--regress/sys/kern/splice/args-oobinline.pl5
-rwxr-xr-xregress/sys/kern/splice/direct.pl13
-rwxr-xr-xregress/sys/kern/splice/echo.pl13
-rwxr-xr-xregress/sys/kern/splice/relay.pl13
-rwxr-xr-xregress/sys/kern/splice/remote.pl13
8 files changed, 44 insertions, 28 deletions
diff --git a/regress/sys/kern/splice/args-oobinline-nonblock.pl b/regress/sys/kern/splice/args-oobinline-nonblock.pl
index 31e3f69d92a..c3b6114c1a4 100644
--- a/regress/sys/kern/splice/args-oobinline-nonblock.pl
+++ b/regress/sys/kern/splice/args-oobinline-nonblock.pl
@@ -16,7 +16,10 @@ our %args = (
oobinline => 1,
},
len => 251,
- md5 => "24b69642243fee9834bceee5b47078ae",
+ md5 => [
+ "24b69642243fee9834bceee5b47078ae",
+ "5aa8135a1340e173a7d7a5fa048a999e",
+ ],
);
1;
diff --git a/regress/sys/kern/splice/args-oobinline-reverse-nonblock.pl b/regress/sys/kern/splice/args-oobinline-reverse-nonblock.pl
index e9a784433c1..30711b072c2 100644
--- a/regress/sys/kern/splice/args-oobinline-reverse-nonblock.pl
+++ b/regress/sys/kern/splice/args-oobinline-reverse-nonblock.pl
@@ -17,7 +17,10 @@ our %args = (
func => \&write_oob,
},
len => 251,
- md5 => "24b69642243fee9834bceee5b47078ae",
+ md5 => [
+ "24b69642243fee9834bceee5b47078ae",
+ "5aa8135a1340e173a7d7a5fa048a999e",
+ ],
);
1;
diff --git a/regress/sys/kern/splice/args-oobinline-reverse.pl b/regress/sys/kern/splice/args-oobinline-reverse.pl
index 4a570b3e5bf..ef0a1dfe478 100644
--- a/regress/sys/kern/splice/args-oobinline-reverse.pl
+++ b/regress/sys/kern/splice/args-oobinline-reverse.pl
@@ -16,7 +16,10 @@ our %args = (
func => \&write_oob,
},
len => 251,
- md5 => "24b69642243fee9834bceee5b47078ae",
+ md5 => [
+ "24b69642243fee9834bceee5b47078ae",
+ "5aa8135a1340e173a7d7a5fa048a999e",
+ ],
);
1;
diff --git a/regress/sys/kern/splice/args-oobinline.pl b/regress/sys/kern/splice/args-oobinline.pl
index 7de0bcb55a0..561341fba6b 100644
--- a/regress/sys/kern/splice/args-oobinline.pl
+++ b/regress/sys/kern/splice/args-oobinline.pl
@@ -15,7 +15,10 @@ our %args = (
oobinline => 1,
},
len => 251,
- md5 => "24b69642243fee9834bceee5b47078ae",
+ md5 => [
+ "24b69642243fee9834bceee5b47078ae",
+ "5aa8135a1340e173a7d7a5fa048a999e",
+ ],
);
1;
diff --git a/regress/sys/kern/splice/direct.pl b/regress/sys/kern/splice/direct.pl
index f7823132fd9..9acee3b3e27 100755
--- a/regress/sys/kern/splice/direct.pl
+++ b/regress/sys/kern/splice/direct.pl
@@ -1,5 +1,5 @@
#!/usr/bin/perl
-# $OpenBSD: direct.pl,v 1.1 2011/01/07 22:06:08 bluhm Exp $
+# $OpenBSD: direct.pl,v 1.2 2011/07/23 23:56:08 bluhm Exp $
# Copyright (c) 2010 Alexander Bluhm <bluhm@openbsd.org>
#
@@ -66,12 +66,13 @@ my $slen = $s->loggrep(qr/^LEN: /) unless $args{server}{nocheck};
my $cmd5 = $c->loggrep(qr/^MD5: /) unless $args{client}{nocheck};
my $smd5 = $s->loggrep(qr/^MD5: /) unless $args{server}{nocheck};
-!$cmd5 || !$smd5 || $cmd5 eq $smd5
+!$cmd5 || !$smd5 || ref($args{md5}) eq 'ARRAY' || $cmd5 eq $smd5
or die "client: $cmd5", "server: $smd5", "md5 mismatch";
-!defined($args{md5}) || !$cmd5 || $cmd5 eq "MD5: $args{md5}\n"
- or die "client: $cmd5", "md5 $args{md5} expected";
-!defined($args{md5}) || !$smd5 || $smd5 eq "MD5: $args{md5}\n"
- or die "server: $smd5", "md5 $args{md5} expected";
+my $md5 = ref($args{md5}) eq 'ARRAY' ? join('|', @{$args{md5}}) : $args{md5};
+!$md5 || !$cmd5 || $cmd5 =~ /^MD5: ($md5)$/
+ or die "client: $cmd5", "md5 $md5 expected";
+!$md5 || !$smd5 || $smd5 =~ /^MD5: ($md5)$/
+ or die "server: $smd5", "md5 $md5 expected";
my %name2proc = (client => $c, server => $s);
foreach my $name (qw(client server)) {
diff --git a/regress/sys/kern/splice/echo.pl b/regress/sys/kern/splice/echo.pl
index 9d147703175..45c8cd7da86 100755
--- a/regress/sys/kern/splice/echo.pl
+++ b/regress/sys/kern/splice/echo.pl
@@ -1,5 +1,5 @@
#!/usr/bin/perl
-# $OpenBSD: echo.pl,v 1.3 2011/07/04 05:43:02 bluhm Exp $
+# $OpenBSD: echo.pl,v 1.4 2011/07/23 23:56:08 bluhm Exp $
# Copyright (c) 2010 Alexander Bluhm <bluhm@openbsd.org>
#
@@ -108,12 +108,13 @@ my $slen = $s->loggrep(qr/^LEN: /) // die "no server len"
my $cmd5 = $c->loggrep(qr/^MD5: /) unless $args{client}{nocheck};
my $smd5 = $s->loggrep(qr/^MD5: /) unless $args{server}{nocheck};
-!$cmd5 || !$smd5 || $cmd5 eq $smd5
+!$cmd5 || !$smd5 || ref($args{md5}) eq 'ARRAY' || $cmd5 eq $smd5
or die "client: $cmd5", "server: $smd5", "md5 mismatch";
-!defined($args{md5}) || !$cmd5 || $cmd5 eq "MD5: $args{md5}\n"
- or die "client: $cmd5", "md5 $args{md5} expected";
-!defined($args{md5}) || !$smd5 || $smd5 eq "MD5: $args{md5}\n"
- or die "server: $smd5", "md5 $args{md5} expected";
+my $md5 = ref($args{md5}) eq 'ARRAY' ? join('|', @{$args{md5}}) : $args{md5};
+!$md5 || !$cmd5 || $cmd5 =~ /^MD5: ($md5)$/
+ or die "client: $cmd5", "md5 $md5 expected";
+!$md5 || !$smd5 || $smd5 =~ /^MD5: ($md5)$/
+ or die "server: $smd5", "md5 $md5 expected";
$args{relay}{errorin} //= 0 unless $args{relay}{nocheck};
$args{relay}{errorout} //= 0 unless $args{relay}{nocheck};
diff --git a/regress/sys/kern/splice/relay.pl b/regress/sys/kern/splice/relay.pl
index f22a314629d..cd2fe35f1fb 100755
--- a/regress/sys/kern/splice/relay.pl
+++ b/regress/sys/kern/splice/relay.pl
@@ -1,5 +1,5 @@
#!/usr/bin/perl
-# $OpenBSD: relay.pl,v 1.3 2011/07/04 05:43:02 bluhm Exp $
+# $OpenBSD: relay.pl,v 1.4 2011/07/23 23:56:08 bluhm Exp $
# Copyright (c) 2010 Alexander Bluhm <bluhm@openbsd.org>
#
@@ -102,12 +102,13 @@ my $slen = $s->loggrep(qr/^LEN: /) // die "no server len"
my $cmd5 = $c->loggrep(qr/^MD5: /) unless $args{client}{nocheck};
my $smd5 = $s->loggrep(qr/^MD5: /) unless $args{server}{nocheck};
-!$cmd5 || !$smd5 || $cmd5 eq $smd5
+!$cmd5 || !$smd5 || ref($args{md5}) eq 'ARRAY' || $cmd5 eq $smd5
or die "client: $cmd5", "server: $smd5", "md5 mismatch";
-!defined($args{md5}) || !$cmd5 || $cmd5 eq "MD5: $args{md5}\n"
- or die "client: $cmd5", "md5 $args{md5} expected";
-!defined($args{md5}) || !$smd5 || $smd5 eq "MD5: $args{md5}\n"
- or die "server: $smd5", "md5 $args{md5} expected";
+my $md5 = ref($args{md5}) eq 'ARRAY' ? join('|', @{$args{md5}}) : $args{md5};
+!$md5 || !$cmd5 || $cmd5 =~ /^MD5: ($md5)$/
+ or die "client: $cmd5", "md5 $md5 expected";
+!$md5 || !$smd5 || $smd5 =~ /^MD5: ($md5)$/
+ or die "server: $smd5", "md5 $md5 expected";
$args{relay}{errorin} //= 0 unless $args{relay}{nocheck};
$args{relay}{errorout} //= 0 unless $args{relay}{nocheck};
diff --git a/regress/sys/kern/splice/remote.pl b/regress/sys/kern/splice/remote.pl
index 05fd6c362db..446774865d5 100755
--- a/regress/sys/kern/splice/remote.pl
+++ b/regress/sys/kern/splice/remote.pl
@@ -1,5 +1,5 @@
#!/usr/bin/perl
-# $OpenBSD: remote.pl,v 1.3 2011/07/04 05:43:02 bluhm Exp $
+# $OpenBSD: remote.pl,v 1.4 2011/07/23 23:56:08 bluhm Exp $
# Copyright (c) 2010 Alexander Bluhm <bluhm@openbsd.org>
#
@@ -146,12 +146,13 @@ my $slen = $s->loggrep(qr/^LEN: /) // die "no server len"
my $cmd5 = $c->loggrep(qr/^MD5: /) unless $args{client}{nocheck};
my $smd5 = $s->loggrep(qr/^MD5: /) unless $args{server}{nocheck};
-!$cmd5 || !$smd5 || $cmd5 eq $smd5
+!$cmd5 || !$smd5 || ref($args{md5}) eq 'ARRAY' || $cmd5 eq $smd5
or die "client: $cmd5", "server: $smd5", "md5 mismatch";
-!defined($args{md5}) || !$cmd5 || $cmd5 eq "MD5: $args{md5}\n"
- or die "client: $cmd5", "md5 $args{md5} expected";
-!defined($args{md5}) || !$smd5 || $smd5 eq "MD5: $args{md5}\n"
- or die "server: $smd5", "md5 $args{md5} expected";
+my $md5 = ref($args{md5}) eq 'ARRAY' ? join('|', @{$args{md5}}) : $args{md5};
+!$md5 || !$cmd5 || $cmd5 =~ /^MD5: ($md5)$/
+ or die "client: $cmd5", "md5 $md5 expected";
+!$md5 || !$smd5 || $smd5 =~ /^MD5: ($md5)$/
+ or die "server: $smd5", "md5 $md5 expected";
$args{relay}{errorin} //= 0 unless $args{relay}{nocheck};
$args{relay}{errorout} //= 0 unless $args{relay}{nocheck};
Copyright © 1996 – 2023 Jason A. Donenfeld. All Rights Reverse Engineered.