Integrate mainline

[p5sagit/p5-mst-13.2.git] / ext / DB_File / t / db-btree.t

diff --git a/ext/DB_File/t/db-btree.t b/ext/DB_File/t/db-btree.t
index ef05de6..668e94a 100755 (executable)
--- a/ext/DB_File/t/db-btree.t
+++ b/ext/DB_File/t/db-btree.t
@@ -18,6 +18,17 @@ BEGIN {
             exit 0;
         }
     }
+    if ($^O eq 'darwin'
+       && $Config{db_version_major} == 1
+       && $Config{db_version_minor} == 0
+       && $Config{db_version_patch} == 0) {
+       warn <<EOM;
+#
+# This test is known to crash in Mac OS X versions 10.1.3 (or earlier)
+# because of the buggy Berkeley DB version included with the OS.
+#
+EOM
+    }
 }
 
 use DB_File; 
@@ -958,7 +969,7 @@ EOM
     use strict ;
     use DB_File ;
 
-    our ($filename, %h);
+    my ($filename, %h);
 
     $filename = "tree" ;
     unlink $filename ;
@@ -1010,7 +1021,7 @@ EOM
     use strict ;
     use DB_File ;
  
-    our ($filename, $x, %h, $status, $key, $value);
+    my ($filename, $x, %h, $status, $key, $value);
 
     $filename = "tree" ;
     unlink $filename ;
@@ -1066,7 +1077,7 @@ EOM
     use strict ;
     use DB_File ;
  
-    our ($filename, $x, %h);
+    my ($filename, $x, %h);
 
     $filename = "tree" ;
  
@@ -1115,7 +1126,7 @@ EOM
     use strict ;
     use DB_File ;
  
-    our ($filename, $x, %h, $found);
+    my ($filename, $x, %h, $found);
 
     $filename = "tree" ;
  
@@ -1150,7 +1161,7 @@ EOM
     use strict ;
     use DB_File ;
  
-    our ($filename, $x, %h, $found);
+    my ($filename, $x, %h, $found);
 
     $filename = "tree" ;
  
@@ -1186,7 +1197,7 @@ EOM
     use DB_File ;
     use Fcntl ;
 
-    our ($filename, $x, %h, $st, $key, $value);
+    my ($filename, $x, %h, $st, $key, $value);
 
     sub match
     {