X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Flib%2Fio_unix.t;h=2f6def0af76e5b02c88d2b177a8e111131dcb05b;hb=569bd3158af2276a406770e3d68e76b7da59b730;hp=2dd32c946de58ea7333ce4d183de65a08bf89abf;hpb=4435c47799d17bebb53fa0fbe063f550be95a17c;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/t/lib/io_unix.t b/t/lib/io_unix.t
index 2dd32c9..2f6def0 100644
--- a/t/lib/io_unix.t
+++ b/t/lib/io_unix.t
@@ -3,7 +3,7 @@
 BEGIN {
     unless(grep /blib/, @INC) {
         chdir 't' if -d 't';
-        unshift @INC, '../lib' if -d '../lib';
+        @INC = '../lib';
     }
 }
 
@@ -22,11 +22,13 @@ BEGIN {
 	    $reason = 'IO extension unavailable';
 	}
 	elsif ($^O eq 'os2') {
-	    use IO::Socket;
+	    require IO::Socket;
 
 	    eval {IO::Socket::pack_sockaddr_un('/tmp/foo') || 1}
 	      or $@ !~ /not implemented/ or
 		$reason = 'compiled without TCP/IP stack v4';
+	} elsif ($^O eq 'qnx') {
+	    $reason = 'Not implemented';
 	}
 	undef $reason if $^O eq 'VMS' and $Config{d_socket};
 	if ($reason) {
@@ -39,12 +41,12 @@ BEGIN {
 $PATH = "/tmp/sock-$$";
 
 # Test if we can create the file within the tmp directory
-if (-e $PATH or not open(TEST, ">$PATH")) {
-    print "1..0\n";
+if (-e $PATH or not open(TEST, ">$PATH") and $^O ne 'os2') {
+    print "1..0 # Skip: cannot open '$PATH' for write\n";
     exit 0;
 }
 close(TEST);
-unlink($PATH) or die "Can't unlink $PATH: $!";
+unlink($PATH) or $^O eq 'os2' or die "Can't unlink $PATH: $!";
 
 # Start testing
 $| = 1;
@@ -67,7 +69,7 @@ if($pid = fork()) {
     $sock->close;
 
     waitpid($pid,0);
-    unlink($PATH) || warn "Can't unlink $PATH: $!";
+    unlink($PATH) || $^O eq 'os2' || warn "Can't unlink $PATH: $!";
 
     print "ok 5\n";