X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FAnyDBM_File.t;h=b87d26a2ff112d4a797888e86d5adcaa20f9cc86;hb=fd20da51661b685c54940aeb116a97beabf44d0f;hp=231e3b8f8b38b2889600b35468d20717bf662d75;hpb=223eb2ffcf4494dce579fa08a12a08a8c05c34c6;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/lib/AnyDBM_File.t b/lib/AnyDBM_File.t
index 231e3b8..b87d26a 100755
--- a/lib/AnyDBM_File.t
+++ b/lib/AnyDBM_File.t
@@ -2,19 +2,12 @@
 
 # $RCSfile: dbm.t,v $$Revision: 4.1 $$Date: 92/08/07 18:27:43 $
 
-use Test::More;
-
 BEGIN {
     chdir 't' if -d 't';
     @INC = '../lib';
     require Config; import Config;
-    if (($Config{'extensions'} !~ /\b(DB|[A-Z]DBM)_File\b/) ){
-      plan skip_all => "1..0 # Skipping (no DB_File or [A-Z]DBM_File)\n";
-    }
-    else {
-       plan tests => 12;
-    }
-
+    require Test::More; import Test::More;
+    plan(tests, 12);
 }
 
 require AnyDBM_File;
@@ -43,7 +36,7 @@ SKIP:
                       if ($Is_Dosish || $^O eq 'MacOS') ;
     ($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size,$atime,$mtime,$ctime,
      $blksize,$blocks) = stat($Dfile);
-    ok(($mode & 0777) == 0640 , "File permissions");
+    ok(($mode & 0777) == ($^O eq 'vos' ? 0750 : 0640) , "File permissions");
 }
 
 while (($key,$value) = each(%h)) {
@@ -135,7 +128,7 @@ ok($h{'foo'} eq '', "empty value");
 
 my $compact = '';
 
-if ($AnyDBM_File::ISA[0] eq 'DB_File' && $DB_File::db_ver >= 2.004010) {
+if ($AnyDBM_File::ISA[0] eq 'DB_File' && ($DB_File::db_ver >= 2.004010 && $DB_File::db_ver < 3.001)) {
      ($major, $minor, $patch) = ($DB_File::db_ver =~ /^(\d+)\.(\d\d\d)(\d\d\d)/) ;
      $major =~ s/^0+// ;
      $minor =~ s/^0+// ;
@@ -147,7 +140,7 @@ if ($AnyDBM_File::ISA[0] eq 'DB_File' && $DB_File::db_ver >= 2.004010) {
      # You are using DB_File $DB_File::VERSION and Berkeley DB $compact
      #
      # Berkeley DB 2 from version 2.4.10 onwards does not allow null keys.
-     # This feature will be reenabled in a future version of Berkeley DB.
+     # This feature returned with version 3.1
      #
 }