diff options
author | Nicholas Clark <nick@ccl4.org> | 2010-12-16 13:25:05 +0000 |
---|---|---|
committer | Nicholas Clark <nick@ccl4.org> | 2010-12-16 14:51:53 +0000 |
commit | 28e5c022d7f209060c6e4d0179285b742e0bad64 (patch) | |
tree | a6184cd7fa6289b7079f0ba662c45afcff28daab /ext/NDBM_File | |
parent | 89cebecca5600bb94e404ffac30bb2fa04e516c3 (diff) | |
download | perl-28e5c022d7f209060c6e4d0179285b742e0bad64.tar.gz |
Converge ext/[GNOS]DBM_File/t/[gnos]dbm.t further.
Including Cross propagating some fixes:
grep in void context warning (f84167b37281b9fd c57cf257e9e58200), but improve
it by avoiding void context entirely, by actually testing the results :-)
"cleaner close on tests, take 2", d1e4d418969ad3c5
Diffstat (limited to 'ext/NDBM_File')
-rw-r--r-- | ext/NDBM_File/t/ndbm.t | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/ext/NDBM_File/t/ndbm.t b/ext/NDBM_File/t/ndbm.t index 7a2ae7069c..03b78c4785 100644 --- a/ext/NDBM_File/t/ndbm.t +++ b/ext/NDBM_File/t/ndbm.t @@ -13,7 +13,7 @@ BEGIN { use strict; use warnings; -use Test::More tests => 79; +use Test::More tests => 81; require NDBM_File; #If Fcntl is not available, try 0x202 or 0x102 for O_RDWR|O_CREAT @@ -31,7 +31,7 @@ if (! -e $Dfile) { } SKIP: { skip "different file permission semantics on $^O", 1 - if $^O eq 'amigaos' || $^O eq 'os2' || $^O eq 'MSWin32' || $^O eq 'NetWare'; + if $^O eq 'amigaos' || $^O eq 'os2' || $^O eq 'MSWin32' || $^O eq 'NetWare' || $^O eq 'dos' || $^O eq 'cygwin'; my ($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size,$atime,$mtime,$ctime, $blksize,$blocks) = stat($Dfile); is($mode & 0777, 0640); @@ -144,7 +144,7 @@ unlink <Op_dbmx*>, $Dfile; require Exporter ; use NDBM_File; @ISA=qw(NDBM_File); - @EXPORT = @NDBM_File::EXPORT if defined @NDBM_File::EXPORT ; + @EXPORT = @NDBM_File::EXPORT ; sub STORE { my $self = shift ; @@ -170,12 +170,12 @@ unlink <Op_dbmx*>, $Dfile; 1 ; EOM - close FILE ; + close FILE or die "Could not close: $!"; BEGIN { push @INC, '.'; } unlink <dbhash_tmp*> ; - eval 'use SubDB ; use Fcntl ; '; + eval 'use SubDB ; use Fcntl ;'; main::is($@, ""); my %h ; my $X ; @@ -444,7 +444,6 @@ unlink <Op_dbmx*>, $Dfile; unlink <Op_dbmx*>; } - { # Check that DBM Filter can cope with read-only $_ @@ -464,7 +463,7 @@ unlink <Op_dbmx*>, $Dfile; $h{"fred"} = "joe" ; is($h{"fred"}, "joe"); - eval { grep { $h{$_} } (1, 2, 3) }; + is_deeply([eval { map { $h{$_} } (1, 2, 3) }], [undef, undef, undef]); is($@, ''); @@ -480,7 +479,7 @@ unlink <Op_dbmx*>, $Dfile; is($db->FIRSTKEY(), "fred"); - eval { grep { $h{$_} } (1, 2, 3) }; + is_deeply([eval { map { $h{$_} } (1, 2, 3) }], [undef, undef, undef]); is($@, ''); undef $db ; |