--- AnyEvent/t/65_event_03_child.t	2009/07/18 15:51:52	1.6
+++ AnyEvent/t/65_event_03_child.t	2012/03/30 04:22:22	1.13
@@ -2,9 +2,6 @@
 
 no warnings;
 
-use AnyEvent;
-BEGIN { eval q{use AnyEvent::Impl::Event;1} or ((print qq{1..0 # SKIP AnyEvent::Impl::Event not found}), exit 0) } 
-
 BEGIN {
    # check for broken perls
    if ($^O =~ /mswin32/i) {
@@ -14,13 +11,20 @@
 
       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;
       }
    }
 }
 
+use AnyEvent;
+
+         BEGIN { $ENV{PERL_ANYEVENT_LOOP_TESTS} or ((print qq{1..0 # SKIP PERL_ANYEVENT_LOOP_TESTS not true\n}), exit 0) }
+         BEGIN { eval q{use AnyEvent::Impl::Event;1} or ((print qq{1..0 # SKIP AnyEvent::Impl::Event not loadable\n}), exit 0) }
+         
+      
+
 $| = 1; print "1..50\n";
 
 $AnyEvent::MAX_SIGNAL_LATENCY = 0.2;
@@ -34,29 +38,38 @@
 
    defined $pid or die "unable to fork";
 
-# work around Tk bug until it has been fixed.
-#my $timer = AnyEvent->timer (after => 2, cb => sub { });
+   # work around Tk bug until it has been fixed.
+   #my $timer = AnyEvent->timer (after => 2, cb => sub { });
 
    my $cv = AnyEvent->condvar;
 
    unless ($pid) {
-      print "ok ${it}2\n";
+      print "ok ${it}2 # child $$\n";
+
+      # POE hits a race condition when the child dies too quickly
+      # because it checks for child exit before installing the signal handler.
+      # seen in version 1.352 - earlier versions had the same bug, but
+      # polled for child exits regularly, so only caused a delay.
+      sleep 1 if $AnyEvent::MODEL eq "POE";
+
       POSIX::_exit 3;
    }
-
    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->wait;
+   $cv->recv;
 
    my $pid2 = fork || POSIX::_exit 7;
 
    my $cv2 = AnyEvent->condvar;
 
-   my $w2 = AnyEvent->child (pid => 0, cb => sub {
+   # Glib is the only model that doesn't support pid == 0
+   my $pid0 = $AnyEvent::MODEL eq "AnyEvent::Impl::Glib" ? $pid2 : 0;
+
+   my $w2 = AnyEvent->child (pid => $pid0, 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;
@@ -69,7 +82,7 @@
       exit 0;
    });
 
-   $cv2->wait;
+   $cv2->recv;
 
    print "ok ${it}7\n";
    print "ok ${it}8\n";