--- AnyEvent/t/02_signals.t	2007/11/16 05:08:18	1.3
+++ AnyEvent/t/02_signals.t	2008/04/22 05:12:19	1.4
@@ -1,21 +1,41 @@
 $|=1;
-BEGIN { print "1..6\n" }
+BEGIN {
+   print "1..5\n";
+}
 
 use AnyEvent;
 use AnyEvent::Impl::Perl;
 
+print STDERR <<EOF;
+
+If the following test hangs for a long time or terminates with a signal
+you either found a bug in AnyEvent or, more likely, you have a defective
+perl (most windows perl distros are broken, cygwin perl works). If you do
+not rely on signal handlers you can force the installation of this module
+and the rest will likely work. Otherwise upgrading to a working perl is
+recommended.
+EOF
+
 print "ok 1\n";
 
 my $cv = AnyEvent->condvar;
 
-my $sw = AnyEvent->signal (signal => 'CHLD', cb => sub {
+my $error = AnyEvent->timer (after => 5, cb => sub {
+   print <<EOF;
+Bail out! No signal caught.
+EOF
+   exit 0;
+});
+
+my $sw = AnyEvent->signal (signal => 'INT', cb => sub {
   print "ok 3\n";
   $cv->broadcast;
 });
 
 print "ok 2\n";
-kill 'CHLD', 0;
+kill 'INT', $$;
 $cv->wait;
+undef $error;
 
 print "ok 4\n";
 
@@ -23,6 +43,3 @@
 
 print "ok 5\n";
 
-kill 'CHLD', 0;
-
-print "ok 6\n";