--- AnyEvent/t/02_signals.t	2008/04/22 05:12:19	1.4
+++ AnyEvent/t/02_signals.t	2011/08/02 20:02:45	1.9
@@ -1,20 +1,16 @@
-$|=1;
 BEGIN {
-   print "1..5\n";
+   unless (exists $SIG{USR1}) {
+      print <<EOF;
+1..0 # SKIP Broken perl detected, skipping tests.
+EOF
+      exit 0;
+   }
 }
 
 use AnyEvent;
-use AnyEvent::Impl::Perl;
-
-print STDERR <<EOF;
+BEGIN { require AnyEvent::Impl::Perl unless $ENV{PERL_ANYEVENT_MODEL} }
 
-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
+$| = 1; print "1..5\n";
 
 print "ok 1\n";
 
@@ -34,7 +30,7 @@
 
 print "ok 2\n";
 kill 'INT', $$;
-$cv->wait;
+$cv->recv;
 undef $error;
 
 print "ok 4\n";