Add more checks and debug info to identify the sporadic test failures.

diff --git a/regress/sys/netinet6/autoport/autoport.pl b/regress/sys/netinet6/autoport/autoport.pl
index 57d16a8..75f0641 100644 (file)
--- a/regress/sys/netinet6/autoport/autoport.pl
+++ b/regress/sys/netinet6/autoport/autoport.pl
@@ -1,12 +1,13 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
+# $OpenBSD: autoport.pl,v 1.2 2017/07/03 19:35:06 bluhm Exp $
 
 use strict;
-use Socket qw(inet_pton PF_INET PF_INET6 SOCK_STREAM SOMAXCONN sockaddr_in sockaddr_in6);
+use warnings;
+use Socket qw(PF_INET PF_INET6 SOCK_STREAM SOMAXCONN
+    inet_pton sockaddr_in sockaddr_in6);
 use Errno;
 
-my @socka = ();
-my ($pf, $host, $sin, $sock, $badsock);
-
+my ($pf, $host, $sin, $badsock);
 
 if (@ARGV < 3 or @ARGV > 4) {
        die "usage: $0 <pf> <listen> <first> [count]\n"
@@ -39,119 +40,135 @@ if ($test_listen >= $test_first && $test_listen <= $test_last) {
 if ($af == "4") {
        $pf = PF_INET;
        $sin = sockaddr_in($test_listen, inet_pton($pf,"127.0.0.1"));
-}
-elsif ($af == "6") {
+} elsif ($af == "6") {
        $pf = PF_INET6;
        $sin = sockaddr_in6($test_listen, inet_pton($pf,"::1"));
-}
-else {
+} else {
        die "af must be 4 or 6\n";
 }
 
+system("sysctl net.inet.ip.portfirst");
+system("sysctl net.inet.ip.portlast");
 
 my $orig_first = qx( sysctl -n net.inet.ip.portfirst );
 chomp $orig_first;
 my $orig_last  = qx( sysctl -n net.inet.ip.portlast );
 chomp $orig_last;
 
+END {
+       system("sysctl net.inet.ip.portfirst=$orig_first") if $orig_first;
+       system("sysctl net.inet.ip.portlast=$orig_last") if $orig_last;
+}
 
 # first < last
 
-socket(SERVSOCK, $pf, SOCK_STREAM, getprotobyname("tcp"));
-bind(SERVSOCK, $sin);
-listen(SERVSOCK, SOMAXCONN);
+socket(my $servsock, $pf, SOCK_STREAM, getprotobyname("tcp"))
+    or die "socket servsock failed: $!";
+bind($servsock, $sin)
+    or die "bind servsock to $test_listen failed: $!";
+listen($servsock, SOMAXCONN)
+    or die "listen servsock failed: $!";
 
 my $rc_f = 0;
 
 print "testing with portfirst < portlast\n";
 
-system("sysctl net.inet.ip.portfirst=$test_first > /dev/null");
-system("sysctl net.inet.ip.portlast=$test_last > /dev/null");
+system("sysctl net.inet.ip.portfirst=$test_first");
+system("sysctl net.inet.ip.portlast=$test_last");
 
+my @socka;
 for ($test_first .. $test_last) {
-       socket($sock, $pf, SOCK_STREAM, getprotobyname("tcp"));
+       socket(my $sock, $pf, SOCK_STREAM, getprotobyname("tcp"))
+           or die "socket sock failed: $!";
        unless (connect($sock, $sin)) {
-               print "failed to connect with errno $!\n";
+               print "FAIL: connect sock to $test_listen failed '$!',",
+                   " but should succeed\n";
                $rc_f = 1;
        }
        push @socka, $sock;
 }
 
-socket($badsock, $pf, SOCK_STREAM, getprotobyname("tcp"));
+socket($badsock, $pf, SOCK_STREAM, getprotobyname("tcp"))
+    or die "socket badsock failed: $!";
 if (connect($badsock, $sin)) {
-       print "connect() succeeded but should have failed\n";
+       print "FAIL: connect badsock to $test_listen succeeded,",
+           " but should fail\n";
        $rc_f = 1;
-}
-elsif (not $!{EADDRNOTAVAIL}) {
-       print "connect() failed with errno $!, should have been EADDRNOTAVAIL\n";
+} elsif (not $!{EADDRNOTAVAIL}) {
+       print "FAIL: connect badsock to $test_listen failed with errno '$!',",
+           " but should be EADDRNOTAVAIL\n";
        $rc_f = 1;
 }
-close($badsock);
+close($badsock)
+    or die "close badsock failed: $!";
 
-while ($sock = pop @socka) {
-       close($sock);
+while (my $sock = pop @socka) {
+       close($sock)
+           or die "close sock failed: $!";
 }
 
-close(SERVSOCK);
-
-sleep 1;
+close($servsock)
+    or die "close servsock failed: $!";
 
 if ($rc_f == 0) {
-       print "test OK\n"
-}
-else {
-       print "test failed\n"
+       print "subtest f PASS\n"
+} else {
+       print "subtest f FAIL\n"
 }
 
 # first > last
 
-socket(SERVSOCK, $pf, SOCK_STREAM, getprotobyname("tcp"));
-bind(SERVSOCK, $sin);
-listen(SERVSOCK, SOMAXCONN);
+socket($servsock, $pf, SOCK_STREAM, getprotobyname("tcp"))
+    or die "socket servsock failed: $!";
+bind($servsock, $sin)
+    or die "bind servsock to $test_listen failed: $!";
+listen($servsock, SOMAXCONN)
+    or die "listen servsock failed: $!";
 
 my $rc_b = 0;
 
 print "testing with portfirst > portlast\n";
 
-system("sysctl net.inet.ip.portfirst=$test_last > /dev/null");
-system("sysctl net.inet.ip.portlast=$test_first > /dev/null");
+system("sysctl net.inet.ip.portfirst=$test_last");
+system("sysctl net.inet.ip.portlast=$test_first");
 
 for ($test_first .. $test_last) {
-       socket($sock, $pf, SOCK_STREAM, getprotobyname("tcp"));
+       socket(my $sock, $pf, SOCK_STREAM, getprotobyname("tcp"))
+           or die "socket sock failed: $!";
        unless (connect($sock, $sin)) {
-               print "failed to connect with errno $!\n";
+               print "FAIL: connect sock to $test_listen failed '$!',",
+                   "but should succeed\n";
                $rc_b = 1;
        }
        push @socka, $sock;
 }
 
-socket($badsock, $pf, SOCK_STREAM, getprotobyname("tcp"));
+socket($badsock, $pf, SOCK_STREAM, getprotobyname("tcp"))
+    or die "socket badsock failed: $!";
 if (connect($badsock, $sin)) {
-       print "connect() succeeded but should have failed\n";
+       print "FAIL: connect badsock to $test_listen succeeded,",
+           " but should fail\n";
        $rc_b = 1;
-}
-elsif (not $!{EADDRNOTAVAIL}) {
-       print "connect() failed with errno $!, should have been EADDRNOTAVAIL\n";
+} elsif (not $!{EADDRNOTAVAIL}) {
+       print "FAIL: connect badsock to $test_listen failed with errno '$!',",
+           " but should be EADDRNOTAVAIL\n";
        $rc_b = 1;
 }
-close($badsock);
+close($badsock)
+    or die "close badsock failed: $!";
 
-while ($sock = pop @socka) {
-       close($sock);
+while (my $sock = pop @socka) {
+       close($sock)
+           or die "close sock failed: $!";
 }
 
-close(SERVSOCK);
-
-sleep 1;
+close($servsock)
+    or die "close servsock failed: $!";
 
 if ($rc_b == 0) {
-       print "test OK\n"
+       print "subtest b PASS\n"
+} else {
+       print "subtest b FAIL\n"
 }
-else {
-       print "test failed\n"
-}
-
-system("sysctl net.inet.ip.portfirst=$orig_first > /dev/null");
-system("sysctl net.inet.ip.portlast=$orig_last > /dev/null");
 
 exit ($rc_f || $rc_b);