Get t/uni/cache.t working under minitest

[perl5.git] / t / op / die_unwind.t

diff --git a/t/op/die_unwind.t b/t/op/die_unwind.t
index 36772c4..29fa6e6 100644 (file)
--- a/t/op/die_unwind.t
+++ b/t/op/die_unwind.t
@@ -1,8 +1,11 @@
-#!./perl
+#!./perl -w
+
+require './test.pl';
+use strict;
 
 #
 # This test checks for $@ being set early during an exceptional
-# unwinding, and that this early setting doesn't affect the late
+# unwinding, and that this early setting does not affect the late
 # setting used to emit the exception from eval{}.  The early setting is
 # a backward-compatibility hack to satisfy modules that were relying on
 # the historical early setting in order to detect exceptional unwinding.
@@ -10,12 +13,6 @@
 # unwinding has been developed.
 #
 
-print "1..12\n";
-my $test_num = 0;
-sub ok {
-    print $_[0] ? "" : "not ", "ok ", ++$test_num, "\n";
-}
-
 {
     package End;
     sub DESTROY { $_[0]->() }
@@ -32,9 +29,9 @@ $val = eval {
        my $c = end { $uerr = $@; $@ = "t2\n"; };
        1;
 }; $err = $@;
-ok $uerr eq "";
-ok $val == 1;
-ok $err eq "";
+is($uerr, "", "\$@ false at start of 'end' block inside 'eval' block");
+is($val, 1, "successful return from 'eval' block");
+is($err, "", "\$@ still false after 'end' block inside 'eval' block");
 
 $@ = "t0\n";
 $val = eval {
@@ -42,9 +39,9 @@ $val = eval {
        my $c = end { $uerr = $@; $@ = "t2\n"; };
        1;
 }; $err = $@;
-ok $uerr eq "t1\n";
-ok $val == 1;
-ok $err eq "";
+is($uerr, "t1\n", "true value assigned to \$@ before 'end' block inside 'eval' block");
+is($val, 1, "successful return from 'eval' block");
+is($err, "", "\$@ still false after 'end' block inside 'eval' block");
 
 $@ = "";
 $val = eval {
@@ -54,9 +51,9 @@ $val = eval {
        };
        1;
 }; $err = $@;
-ok $uerr eq "t3\n";
-ok !defined($val);
-ok $err eq "t3\n";
+is($uerr, "t3\n");
+is($val, undef, "undefined return value from 'eval' block with 'die'");
+is($err, "t3\n");
 
 $@ = "t0\n";
 $val = eval {
@@ -67,8 +64,8 @@ $val = eval {
        };
        1;
 }; $err = $@;
-ok $uerr eq "t3\n";
-ok !defined($val);
-ok $err eq "t3\n";
+is($uerr, "t3\n");
+is($val, undef, "undefined return value from 'eval' block with 'die'");
+is($err, "t3\n");
 
-1;
+done_testing();