1 files changed, 13 insertions, 4 deletions
diff --git a/contrib/perl5/t/lib/fatal.t b/contrib/perl5/t/lib/fatal.t
index fb3757f5cda9..4013fbd37136 100755
--- a/contrib/perl5/t/lib/fatal.t
+++ b/contrib/perl5/t/lib/fatal.t
@@ -3,11 +3,11 @@
 BEGIN {
    chdir 't' if -d 't';
    unshift @INC, '../lib';
-   print "1..9\n";
+   print "1..15\n";
 }
 
 use strict;
-use Fatal qw(open);
+use Fatal qw(open close :void opendir);
 
 my $i = 1;
 eval { open FOO, '<lkjqweriuapofukndajsdlfjnvcvn' };
@@ -20,8 +20,17 @@ for ('$foo', "'$foo'", "*$foo", "\\*$foo") {
     print "not " if $@;
     print "ok $i\n"; ++$i;
 
-    print "not " unless scalar(<FOO>) =~ m|^#!./perl|;
+    print "not " if $@ or scalar(<$foo>) !~ m|^#!./perl|;
+    print "ok $i\n"; ++$i;
+    eval qq{ close FOO };
     print "not " if $@;
     print "ok $i\n"; ++$i;
-    close FOO;
 }
+
+eval { opendir FOO, 'lkjqweriuapofukndajsdlfjnvcvn' };
+print "not " unless $@ =~ /^Can't open/;
+print "ok $i\n"; ++$i;
+
+eval { my $a = opendir FOO, 'lkjqweriuapofukndajsdlfjnvcvn' };
+print "not " if $@ =~ /^Can't open/;
+print "ok $i\n"; ++$i;