Rewhack Test-Simple into core harness.

[p5sagit/p5-mst-13.2.git] / lib / Test / Simple / t / plan_is_noplan.t

diff --git a/lib/Test/Simple/t/plan_is_noplan.t b/lib/Test/Simple/t/plan_is_noplan.t
index 0c2a5cd..dd0833c 100644 (file)
--- a/lib/Test/Simple/t/plan_is_noplan.t
+++ b/lib/Test/Simple/t/plan_is_noplan.t
@@ -16,10 +16,12 @@ my $test_num = 1;
 # Utility testing functions.
 sub ok ($;$) {
     my($test, $name) = @_;
-    print "not " unless $test;
-    print "ok $test_num";
-    print " - $name" if defined $name;
-    print "\n";
+    my $ok = '';
+    $ok .= "not " unless $test;
+    $ok .= "ok $test_num";
+    $ok .= " - $name" if defined $name;
+    $ok .= "\n";
+    print $ok;
     $test_num++;
 }
 
@@ -28,9 +30,9 @@ package main;
 
 require Test::Simple;
 
-push @INC, 'lib/Test/Simple/';
-require Catch;
-my($out, $err) = Catch::caught();
+push @INC, '../t/lib';
+require Test::Simple::Catch::More;
+my($out, $err) = Test::Simple::Catch::More::caught();
 
 
 Test::Simple->import('no_plan');