diff options
| author | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2013-01-04 12:43:53 +0000 |
|---|---|---|
| committer | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2013-01-04 12:43:53 +0000 |
| commit | c14490081b740227bf61a294bd22524d16cc73e6 (patch) | |
| tree | 94c7593a44a412034ebbfdec0f5c1fe4ebfa56c7 | |
| parent | 26d0efa5b691c24011762d4a534357a4ad8811fc (diff) | |
Fix another race in socket splicing test.
| -rw-r--r-- | regress/sys/kern/sosplice/funcs.pl | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/regress/sys/kern/sosplice/funcs.pl b/regress/sys/kern/sosplice/funcs.pl index 995d0f62718..d82b7e92970 100644 --- a/regress/sys/kern/sosplice/funcs.pl +++ b/regress/sys/kern/sosplice/funcs.pl @@ -1,4 +1,4 @@ -# $OpenBSD: funcs.pl,v 1.1 2013/01/03 17:36:39 bluhm Exp $ +# $OpenBSD: funcs.pl,v 1.2 2013/01/04 12:43:52 bluhm Exp $ # Copyright (c) 2010-2013 Alexander Bluhm <bluhm@openbsd.org> # @@ -420,12 +420,13 @@ sub errignore { $SIG{PIPE} = 'IGNORE'; $SIG{__DIE__} = sub { die @_ if $^S; - warn @_; + warn "Error ignored"; my $soerror; $soerror = getsockopt(STDIN, SOL_SOCKET, SO_ERROR); print STDERR "ERROR IN: ", unpack('i', $soerror), "\n"; $soerror = getsockopt(STDOUT, SOL_SOCKET, SO_ERROR); print STDERR "ERROR OUT: ", unpack('i', $soerror), "\n"; + warn @_; IO::Handle::flush(\*STDERR); POSIX::_exit(0); }; @@ -637,14 +638,14 @@ sub check_error { my $ein = $p->loggrep(qr/^ERROR IN: /); defined($ein) && $ein eq "ERROR IN: $args{$name}{errorin}\n" - or die "$name: $ein", + or die "$name: $ein ", "error in $args{$name}{errorin} expected"; } if (defined($args{$name}{errorout})) { my $eout = $p->loggrep(qr/^ERROR OUT: /); defined($eout) && $eout eq "ERROR OUT: $args{$name}{errorout}\n" - or die "$name: $eout", + or die "$name: $eout ", "error out $args{$name}{errorout} expected"; } } |