From: bluhm <bluhm@openbsd.org>
Date: Thu, 25 Aug 2016 17:13:59 +0000 (+0000)
Subject: Fix sosplice tests on 32 bit systems by putting the correct number
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=9068596c3d9233a974cc00827b759a33a4a838d4;p=openbsd

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.
---

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";
     },
 );