--- AnyEvent/t/65_event_04_condvar.t	2009/07/09 22:49:18	1.2
+++ AnyEvent/t/65_event_04_condvar.t	2011/08/18 17:58:53	1.8
@@ -1,10 +1,11 @@
-$|=1;
-BEGIN {
-   print "1..21\n"
-}
-
 use AnyEvent;
-use AnyEvent::Impl::Event;
+
+         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..28\n";
 
 print "ok 1\n";
 
@@ -30,7 +31,7 @@
    });
 
    print "ok 2\n";
-   $cv->wait;
+   $cv->recv;
    print "ok 8\n";
 
    my @x = $cv->recv;
@@ -73,3 +74,25 @@
    print "ok 21\n";
 }
 
+{
+   my $cv = AE::cv {
+      print +($_[0]->recv)[0] == 6 ? "" : "not ", "ok 27\n";
+   };
+
+   print "ok 22\n";
+
+   $cv->begin (sub {
+      print "ok 26\n";
+      $_[0](6);
+   });
+
+   print "ok 23\n";
+   $cv->begin;
+   print "ok 24\n";
+   $cv->end;
+   print "ok 25\n";
+   $cv->end;
+
+   print "ok 28\n";
+}
+