diff options
| author | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2016-08-25 17:14:00 +0000 |
|---|---|---|
| committer | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2016-08-25 17:14:00 +0000 |
| commit | e78ca96e1113c4ee127ef6622c8cd7f91c023525 (patch) | |
| tree | 58d285854ba7bdea381b5e720c766e05a4073aad /regress/sys | |
| parent | ebad1ed248aa5948c0a139902f3228163c693437 (diff) | |
Fix sosplice tests on 32 bit systems by putting the correct number
of bytes into the time_t Perl pack template. Also fix error messages.
Diffstat (limited to 'regress/sys')
| -rw-r--r-- | regress/sys/kern/sosplice/error/args-idle-EINVAL.pl | 4 | ||||
| -rw-r--r-- | regress/sys/kern/sosplice/error/args-max-EINVAL.pl | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/regress/sys/kern/sosplice/error/args-idle-EINVAL.pl b/regress/sys/kern/sosplice/error/args-idle-EINVAL.pl index fccf11ecf1f..3e32cb64287 100644 --- a/regress/sys/kern/sosplice/error/args-idle-EINVAL.pl +++ b/regress/sys/kern/sosplice/error/args-idle-EINVAL.pl @@ -31,9 +31,9 @@ our %args = ( if ($Config{longsize} == 8) { $packed = pack('iiiiiiii', $ss->fileno(),0,0,0,-1,-1,-1,-1); } else { - $packed = pack('iiiii', $ss->fileno(),0,0,-1,-1); + $packed = pack('iiiiii', $ss->fileno(),0,0,-1,-1,-1); } $s->setsockopt(SOL_SOCKET, SO_SPLICE, $packed) - and die "splice to unconnected socket succeeded"; + and die "splice with negative idle timeout succeeded"; }, ); diff --git a/regress/sys/kern/sosplice/error/args-max-EINVAL.pl b/regress/sys/kern/sosplice/error/args-max-EINVAL.pl index e61d83a81b5..135f775e30a 100644 --- a/regress/sys/kern/sosplice/error/args-max-EINVAL.pl +++ b/regress/sys/kern/sosplice/error/args-max-EINVAL.pl @@ -31,9 +31,9 @@ our %args = ( if ($Config{longsize} == 8) { $packed = pack('iiiiiiii', $ss->fileno(),0,-1,-1,0,0,0,0); } else { - $packed = pack('iiiii', $ss->fileno(),-1,-1,0,0); + $packed = pack('iiiiii', $ss->fileno(),-1,-1,0,0,0); } $s->setsockopt(SOL_SOCKET, SO_SPLICE, $packed) - and die "splice to unconnected socket succeeded"; + and die "splice with negative maximum succeeded"; }, ); |