--- AnyEvent/t/64_glib_03_child.t	2008/10/02 08:43:57	1.1
+++ AnyEvent/t/64_glib_03_child.t	2011/08/02 20:02:46	1.9
@@ -1,4 +1,6 @@
-$|=1;
+use POSIX ();
+
+no warnings;
 
 BEGIN {
    # check for broken perls
@@ -9,66 +11,72 @@
 
       unless ($ok) {
          print <<EOF;
-1..0 # Your perl interpreter is badly BROKEN. Child watchers will not work, ever. Try upgrading to a newer perl or a working perl (cygwin's perl is known to work). If that is not an option, you should be able to use the remaining functionality of AnyEvent, but child watchers WILL NOT WORK.
+1..0 # SKIP Your perl interpreter is badly BROKEN. Child watchers will not work, ever. Try upgrading to a newer perl or a working perl (cygwin's perl is known to work). If that is not an option, you should be able to use the remaining functionality of AnyEvent, but child watchers WILL NOT WORK.
 EOF
          exit 0;
       }
    }
 }
 
-BEGIN {
-   print "1..7\n"
-}
-
 use AnyEvent;
-use AnyEvent::Impl::Glib;
+BEGIN { eval q{use AnyEvent::Impl::Glib;1} or ((print qq{1..0 # SKIP AnyEvent::Impl::Glib not loadable
+}), exit 0) } 
+
+$| = 1; print "1..50\n";
 
-print "ok 1\n";
+$AnyEvent::MAX_SIGNAL_LATENCY = 0.2;
 
-AnyEvent::detect; # force-load event model
+for my $it ("", 1, 2, 3, 4) {
+   print "ok ${it}1\n";
 
-my $pid = fork;
+   AnyEvent::detect; # force-load event model
 
-defined $pid or die "unable to fork";
+   my $pid = fork;
+
+   defined $pid or die "unable to fork";
 
 # work around Tk bug until it has been fixed.
 #my $timer = AnyEvent->timer (after => 2, cb => sub { });
 
-my $cv = AnyEvent->condvar;
+   my $cv = AnyEvent->condvar;
 
-unless ($pid) {
-   print "ok 2\n";
-   exit 3;
-}
+   unless ($pid) {
+      print "ok ${it}2\n";
+      POSIX::_exit 3;
+   }
 
-my $w = AnyEvent->child (pid => $pid, cb => sub {
-   print $pid == $_[0] ? "" : "not ", "ok 3\ # $pid == $_[0]\n";
-   print 3 == ($_[1] >> 8) ? "" : "not ", "ok 4 # 3 == $_[1] >> 8 ($_[1])\n";
-   $cv->broadcast;
-});
-
-$cv->wait;
-
-my $pid2 = fork || exit 7;
-
-my $cv2 = AnyEvent->condvar;
-
-my $w2 = AnyEvent->child (pid => 0, cb => sub {
-   print $pid2 == $_[0] ? "" : "not ", "ok 5 # $pid2 == $_[0]\n";
-   print 7 == ($_[1] >> 8) ? "" : "not ", "ok 6 # 7 == $_[1] >> 8 ($_[1])\n";
-   $cv2->broadcast;
-});
+   my $w = AnyEvent->child (pid => $pid, cb => sub {
+      print $pid == $_[0] ? "" : "not ", "ok ${it}3\ # $pid == $_[0]\n";
+      print 3 == ($_[1] >> 8) ? "" : "not ", "ok ${it}4 # 3 == $_[1] >> 8 ($_[1])\n";
+      $cv->broadcast;
+   });
+
+   $cv->recv;
+
+   my $pid2 = fork || POSIX::_exit 7;
+
+   my $cv2 = AnyEvent->condvar;
+
+   my $w2 = AnyEvent->child (pid => 0, cb => sub {
+      print $pid2 == $_[0] ? "" : "not ", "ok ${it}5 # $pid2 == $_[0]\n";
+      print 7 == ($_[1] >> 8) ? "" : "not ", "ok ${it}6 # 7 == $_[1] >> 8 ($_[1])\n";
+      $cv2->broadcast;
+   });
 
-my $error = AnyEvent->timer (after => 5, cb => sub {
-   print <<EOF;
+   my $error = AnyEvent->timer (after => 5, cb => sub {
+      print <<EOF;
 Bail out! No child exit detected. This is either a bug in AnyEvent or a bug in your Perl (mostly some windows distributions suffer from that): child watchers might not work properly on this platform. You can force installation of this module if you do not rely on child watchers, or you could upgrade to a working version of Perl for your platform.\n";
 EOF
-   exit 0;
-});
+      exit 0;
+   });
 
-$cv2->wait;
+   $cv2->recv;
 
-print "ok 7\n";
+   print "ok ${it}7\n";
+   print "ok ${it}8\n";
+   print "ok ${it}9\n";
+   print "ok ", $it*10+10, "\n";
+}