Upgrade to Test-Simple-0.78

p4raw-id: //depot/perl@33394

3 files changed, 26 insertions, 4 deletions

diff --git a/t/lib/Test/Simple/sample_tests/death.plx b/t/lib/Test/Simple/sample_tests/death.plx
index ef4ba8c188..493784c0cd 100644
--- a/t/lib/Test/Simple/sample_tests/death.plx
+++ b/t/lib/Test/Simple/sample_tests/death.plx
@@ -4,10 +4,12 @@ push @INC, 't/lib';
 require Test::Simple::Catch;
 my($out, $err) = Test::Simple::Catch::caught();
 
+require Dev::Null;
+
 Test::Simple->import(tests => 5);
-close STDERR;
+tie *STDERR, 'Dev::Null';
 
 ok(1);
 ok(1);
 ok(1);
-die "Knife?";
+die "This is a test";
diff --git a/t/lib/Test/Simple/sample_tests/death_with_handler.plx b/t/lib/Test/Simple/sample_tests/death_with_handler.plx
new file mode 100644
index 0000000000..2009a0e2dd
--- /dev/null
+++ b/t/lib/Test/Simple/sample_tests/death_with_handler.plx
@@ -0,0 +1,18 @@
+require Test::Simple;
+
+push @INC, 't/lib';
+require Test::Simple::Catch;
+my($out, $err) = Test::Simple::Catch::caught();
+
+Test::Simple->import(tests => 2);
+
+# Test we still get the right exit code despite having a die
+# handler.
+$SIG{__DIE__} = sub {};
+
+require Dev::Null;
+tie *STDERR, 'Dev::Null';
+
+ok(1);
+ok(1);
+die "This is a test";
diff --git a/t/lib/Test/Simple/sample_tests/last_minute_death.plx b/t/lib/Test/Simple/sample_tests/last_minute_death.plx
index ef86a63c51..fe8451edfd 100644
--- a/t/lib/Test/Simple/sample_tests/last_minute_death.plx
+++ b/t/lib/Test/Simple/sample_tests/last_minute_death.plx
@@ -5,7 +5,9 @@ require Test::Simple::Catch;
 my($out, $err) = Test::Simple::Catch::caught();
 
 Test::Simple->import(tests => 5);
-close STDERR;
+
+require Dev::Null;
+tie *STDERR, 'Dev::Null';
 
 ok(1);
 ok(1);
@@ -13,4 +15,4 @@ ok(1);
 ok(1);
 ok(1);
 
-die "Almost there...";
+die "This is a test";