The test suite tweak in #6101 wasn't quite right.

[p5sagit/p5-mst-13.2.git] / t / lib / socket.t

diff --git a/t/lib/socket.t b/t/lib/socket.t
old mode 100644 (file)
new mode 100755 (executable)
index e63c43a..d5e1848
--- a/t/lib/socket.t
+++ b/t/lib/socket.t
@@ -2,9 +2,10 @@
 
 BEGIN {
     chdir 't' if -d 't';
-    @INC = '../lib' if -d '../lib';
+    unshift @INC, '../lib' if -d '../lib';
     require Config; import Config;
-    if ($Config{'extensions'} !~ /\bSocket\b/ && $Config{'osname'} ne 'VMS') {
+    if ($Config{'extensions'} !~ /\bSocket\b/ && 
+        !(($^O eq 'VMS') && $Config{d_socket})) {
        print "1..0\n";
        exit 0;
     }
@@ -12,7 +13,7 @@ BEGIN {
        
 use Socket;
 
-print "1..6\n";
+print "1..8\n";
 
 if (socket(T,PF_INET,SOCK_STREAM,6)) {
   print "ok 1\n";
@@ -24,8 +25,12 @@ if (socket(T,PF_INET,SOCK_STREAM,6)) {
                inet_ntoa((unpack_sockaddr_in(getpeername(T)))[1]),"\n";
 
        syswrite(T,"hello",5);
-       sysread(T,$buff,10);
-       print $buff eq "hello" ? "ok 3\n" : "not ok 3\n";
+       $read = sysread(T,$buff,10);    # Connection may be granted, then closed!
+       while ($read > 0 && length($buff) < 5) {
+           # adjust for fact that TCP doesn't guarantee size of reads/writes
+           $read = sysread(T,$buff,10,length($buff));
+       }
+       print(($read == 0 || $buff eq "hello") ? "ok 3\n" : "not ok 3\n");
   }
   else {
        print "# You're allowed to fail tests 2 and 3 if.\n";
@@ -50,8 +55,12 @@ if( socket(S,PF_INET,SOCK_STREAM,6) ){
                inet_ntoa((unpack_sockaddr_in(getpeername(S)))[1]),"\n";
 
        syswrite(S,"olleh",5);
-       sysread(S,$buff,10);
-       print $buff eq "olleh" ? "ok 6\n" : "not ok 6\n";
+       $read = sysread(S,$buff,10);    # Connection may be granted, then closed!
+       while ($read > 0 && length($buff) < 5) {
+           # adjust for fact that TCP doesn't guarantee size of reads/writes
+           $read = sysread(S,$buff,10,length($buff));
+       }
+       print(($read == 0 || $buff eq "olleh") ? "ok 6\n" : "not ok 6\n");
   }
   else {
        print "# You're allowed to fail tests 5 and 6 if.\n";
@@ -65,3 +74,14 @@ else {
        print "# $!\n";
        print "not ok 4\n";
 }
+
+# warnings
+$SIG{__WARN__} = sub {
+    ++ $w if $_[0] =~ /^6-ARG sockaddr_in call is deprecated/ ;
+} ;
+$w = 0 ;
+sockaddr_in(1,2,3,4,5,6) ;
+print ($w == 1 ? "not ok 7\n" : "ok 7\n") ;
+use warnings 'Socket' ;
+sockaddr_in(1,2,3,4,5,6) ;
+print ($w == 1 ? "ok 8\n" : "not ok 8\n") ;