move op/ipc{msg,sem}.t into lib/ipc_sysv.t

	Message-Id: <199807101008.NAA10817@alpha.hut.fi>
	Subject: Re: make minitest does not work out of the box - test subset
	    needs pruning

p4raw-id: //depot/perl@1418

diff --git a/MANIFEST b/MANIFEST
index 3013bd8..a8e83e1 100644 (file)
--- a/MANIFEST
+++ b/MANIFEST
@@ -838,6 +838,7 @@ t/lib/io_taint.t    See if the untaint method from IO works
 t/lib/io_tell.t                See if seek()/tell()-related methods from IO work
 t/lib/io_udp.t         See if UDP socket-related methods from IO work
 t/lib/io_xs.t          See if XSUB methods from IO work
+t/lib/ipc_sysv.t       See if IPC::SysV works
 t/lib/ndbm.t           See if NDBM_File works
 t/lib/odbm.t           See if ODBM_File works
 t/lib/opcode.t         See if Opcode works
@@ -894,8 +895,6 @@ t/op/hashwarn.t             See if warnings for bad hash assignments work
 t/op/inc.t             See if inc/dec of integers near 32 bit limit work
 t/op/index.t           See if index works
 t/op/int.t             See if int works
-t/op/ipcmsg.t          See if msg* ops work
-t/op/ipcsem.t          See if sem* ops work
 t/op/join.t            See if join works
 t/op/list.t            See if array lists work
 t/op/local.t           See if local works

diff --git a/t/lib/ipc_sysv.t b/t/lib/ipc_sysv.t
new file mode 100755 (executable)
index 0000000..f74c5fa
--- /dev/null
+++ b/t/lib/ipc_sysv.t
@@ -0,0 +1,157 @@
+#!./perl
+
+BEGIN {
+    chdir 't' if -d 't';
+
+    @INC = '../lib';
+
+    require Config; import Config;
+
+    unless ($Config{'d_msg'} eq 'define' &&
+           $Config{'d_sem'} eq 'define') {
+       print "1..0\n";
+       exit;
+    }
+}
+
+# These constants are common to all tests.
+# Later the sem* tests will import more for themselves.
+
+use IPC::SysV qw(IPC_PRIVATE IPC_NOWAIT IPC_STAT IPC_RMID
+                S_IRWXU S_IRWXG S_IRWXO);
+use strict;
+
+print "1..16\n";
+
+my $msg;
+my $sem;
+
+$SIG{__DIE__} = 'cleanup'; # will cleanup $msg and $sem if needed
+
+if ($Config{'d_msgget'} eq 'define' &&
+    $Config{'d_msgctl'} eq 'define' &&
+    $Config{'d_msgsnd'} eq 'define' &&
+    $Config{'d_msgrcv'} eq 'define') {
+    $msg = msgget(IPC_PRIVATE, S_IRWXU | S_IRWXG | S_IRWXO);
+    # Very first time called after machine is booted value may be 0 
+    die "msgget failed: $!\n" unless defined($msg) && $msg >= 0;
+
+    print "ok 1\n";
+
+    #Putting a message on the queue
+    my $msgtype = 1;
+    my $msgtext = "hello";
+
+    msgsnd($msg,pack("L a*",$msgtype,$msgtext),0) or print "not ";
+    print "ok 2\n";
+
+    my $data;
+    msgctl($msg,IPC_STAT,$data) or print "not ";
+    print "ok 3\n";
+
+    print "not " unless length($data);
+    print "ok 4\n";
+
+    my $msgbuf;
+    msgrcv($msg,$msgbuf,256,0,IPC_NOWAIT) or print "not ";
+    print "ok 5\n";
+
+    my($rmsgtype,$rmsgtext) = unpack("L a*",$msgbuf);
+
+    print "not " unless($rmsgtype == $msgtype && $rmsgtext eq $msgtext);
+    print "ok 6\n";
+} else {
+    for (1..6) {
+       print "ok $_\n"; # fake it
+    }
+}
+
+if($Config{'d_semget'} eq 'define' &&
+   $Config{'d_semctl'} eq 'define') {
+
+    use IPC::SysV qw(IPC_CREAT GETALL SETALL);
+
+    $sem = semget(IPC_PRIVATE, 10, S_IRWXU | S_IRWXG | S_IRWXO | IPC_CREAT);
+    # Very first time called after machine is booted value may be 0 
+    die "semget: $!\n" unless defined($sem) && $sem >= 0;
+
+    print "ok 7\n";
+
+    my $data;
+    semctl($sem,0,IPC_STAT,$data) or print "not ";
+    print "ok 8\n";
+
+    print "not " unless length($data);
+    print "ok 9\n";
+
+    my $template;
+
+    # Find the pack/unpack template capable of handling native C shorts.
+
+    if      ($Config{shortsize} == 2) {
+       $template = "s";
+    } elsif ($Config{shortsize} == 4) {
+       $template = "l";
+    } elsif ($Config{shortsize} == 8) {
+       # Try quad last because not supported everywhere.
+       foreach my $t (qw(i q)) {
+           # We could trap the unsupported quad template with eval
+           # but if we get this far we should have quad support anyway.
+           if (length(pack($t, 0)) == 8) {
+               $template = $t;
+               last;
+           }
+       }
+    }
+
+    die "$0: cannot pack native shorts\n" unless defined $template;
+
+    $template .= "*";
+
+    my $nsem = 10;
+
+    semctl($sem,0,SETALL,pack($template,(0) x $nsem)) or print "not ";
+    print "ok 10\n";
+
+    $data = "";
+    semctl($sem,0,GETALL,$data) or print "not ";
+    print "ok 11\n";
+
+    print "not " unless length($data) == length(pack($template,(0) x $nsem));
+    print "ok 12\n";
+
+    my @data = unpack($template,$data);
+
+    my $adata = "0" x $nsem;
+
+    print "not " unless @data == $nsem and join("",@data) eq $adata;
+    print "ok 13\n";
+
+    my $poke = 2;
+
+    $data[$poke] = 1;
+    semctl($sem,0,SETALL,pack($template,@data)) or print "not ";
+    print "ok 14\n";
+    
+    $data = "";
+    semctl($sem,0,GETALL,$data) or print "not ";
+    print "ok 15\n";
+
+    @data = unpack($template,$data);
+
+    my $bdata = "0" x $poke . "1" . "0" x ($nsem-$poke-1);
+
+    print "not " unless join("",@data) eq $bdata;
+    print "ok 16\n";
+} else {
+    for (7..16) {
+       print "ok $_\n"; # fake it
+    }
+}
+
+sub cleanup {
+    msgctl($msg,IPC_RMID,0)       if defined $msg;
+    semctl($sem,0,IPC_RMID,undef) if defined $sem;
+}
+
+cleanup;

diff --git a/t/op/ipcmsg.t b/t/op/ipcmsg.t
deleted file mode 100755 (executable)
index 8c3931a..0000000
--- a/t/op/ipcmsg.t
+++ /dev/null
@@ -1,57 +0,0 @@
-#!./perl
-
-BEGIN {
-    chdir 't' if -d 't';
-    @INC = '../lib';
-}
-
-use Config;
-
-BEGIN {
-    unless($Config{'d_msgget'} eq 'define' &&
-          $Config{'d_msgctl'} eq 'define' &&
-          $Config{'d_msgsnd'} eq 'define' &&
-          $Config{'d_msgrcv'} eq 'define') {
-       print "1..0\n";
-       exit;
-    }
-}
-
-use strict;
-
-use IPC::SysV qw(IPC_PRIVATE IPC_NOWAIT IPC_STAT IPC_RMID
-                S_IRWXU S_IRWXG S_IRWXO);
-
-print "1..6\n";
-
-my $msg = msgget(IPC_PRIVATE, S_IRWXU | S_IRWXG | S_IRWXO);
-# Very first time called after machine is booted value may be 0 
-die "msgget failed: $!\n" unless defined($msg) && $msg >= 0;
-
-print "ok 1\n";
-
-#Putting a message on the queue
-my $msgtype = 1;
-my $msgtext = "hello";
-
-msgsnd($msg,pack("L a*",$msgtype,$msgtext),0) or print "not ";
-print "ok 2\n";
-
-my $data;
-msgctl($msg,IPC_STAT,$data) or print "not ";
-print "ok 3\n";
-
-print "not " unless length($data);
-print "ok 4\n";
-
-my $msgbuf;
-msgrcv($msg,$msgbuf,256,0,IPC_NOWAIT) or print "not ";
-print "ok 5\n";
-
-my($rmsgtype,$rmsgtext) = unpack("L a*",$msgbuf);
-
-print "not " unless($rmsgtype == $msgtype && $rmsgtext eq $msgtext);
-print "ok 6\n";
-
-msgctl($msg,IPC_RMID,0);
-

diff --git a/t/op/ipcsem.t b/t/op/ipcsem.t
deleted file mode 100755 (executable)
index 901ceea..0000000
--- a/t/op/ipcsem.t
+++ /dev/null
@@ -1,101 +0,0 @@
-#!./perl
-
-BEGIN {
-    chdir 't' if -d 't';
-    @INC = '../lib';
-    $SIG{__DIE__} = 'cleanup';
-}
-
-use Config;
-
-BEGIN {
-    unless($Config{'d_semget'} eq 'define' &&
-          $Config{'d_semctl'} eq 'define') {
-       print "1..0\n";
-       exit;
-    }
-}
-
-use strict;
-
-use IPC::SysV qw(IPC_PRIVATE IPC_CREAT IPC_STAT IPC_RMID
-                GETALL SETALL
-                S_IRWXU S_IRWXG S_IRWXO);
-
-print "1..10\n";
-
-my $sem = semget(IPC_PRIVATE, 10, S_IRWXU | S_IRWXG | S_IRWXO | IPC_CREAT);
-# Very first time called after machine is booted value may be 0 
-die "semget: $!\n" unless defined($sem) && $sem >= 0;
-
-print "ok 1\n";
-
-my $data;
-semctl($sem,0,IPC_STAT,$data) or print "not ";
-print "ok 2\n";
-
-print "not " unless length($data);
-print "ok 3\n";
-
-my $template;
-
-# Find the pack/unpack template capable of handling native C shorts.
-
-if      ($Config{shortsize} == 2) {
-    $template = "s";
-} elsif ($Config{shortsize} == 4) {
-    $template = "l";
-} elsif ($Config{shortsize} == 8) {
-    foreach my $t (qw(i q)) { # Try quad last because not supported everywhere.
-       # We could trap the unsupported quad template with eval
-       # but if we get this far we should have quad support anyway.
-       if (length(pack($t, 0)) == 8) {
-            $template = $t;
-            last;
-        }
-    }
-}
-
-die "$0: cannot pack native shorts\n" unless defined $template;
-
-$template .= "*";
-
-my $nsem = 10;
-
-semctl($sem,0,SETALL,pack($template,(0) x $nsem)) or print "not ";
-print "ok 4\n";
-
-$data = "";
-semctl($sem,0,GETALL,$data) or print "not ";
-print "ok 5\n";
-
-print "not " unless length($data) == length(pack($template,(0) x $nsem));
-print "ok 6\n";
-
-my @data = unpack($template,$data);
-
-my $adata = "0" x $nsem;
-
-print "not " unless @data == $nsem and join("",@data) eq $adata;
-print "ok 7\n";
-
-my $poke = 2;
-
-$data[$poke] = 1;
-semctl($sem,0,SETALL,pack($template,@data)) or print "not ";
-print "ok 8\n";
-
-$data = "";
-semctl($sem,0,GETALL,$data) or print "not ";
-print "ok 9\n";
-
-@data = unpack($template,$data);
-
-my $bdata = "0" x $poke . "1" . "0" x ($nsem-$poke-1);
-
-print "not " unless join("",@data) eq $bdata;
-print "ok 10\n";
-
-sub cleanup { semctl($sem,0,IPC_RMID,undef) if defined $sem }
-
-cleanup;