summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeon Brocard <acme@astray.com>2004-02-18 12:24:19 +0000
committerLeon Brocard <acme@astray.com>2004-02-18 12:24:19 +0000
commita3d0d9a6c95428b91d81d852266ef49f8669dbe3 (patch)
treeb8f04d7939b36699fde7037d008e2da20d764655
parentd85ee531cb4d87f5fff58ef8556488c95b4ea8ec (diff)
downloadperl-a3d0d9a6c95428b91d81d852266ef49f8669dbe3.tar.gz
Warn correctly about old DB under Mac OS X Jaguar
(spotted by Elizabeth Mattijsen) p4raw-id: //depot/maint-5.005/perl@22335
-rwxr-xr-xt/lib/db-btree.t7
-rwxr-xr-xt/lib/db-recno.t5
2 files changed, 3 insertions, 9 deletions
diff --git a/t/lib/db-btree.t b/t/lib/db-btree.t
index 2fc11cd216..5ee3f7432c 100755
--- a/t/lib/db-btree.t
+++ b/t/lib/db-btree.t
@@ -18,10 +18,8 @@ BEGIN {
exit 0;
}
}
- if ($^O eq 'darwin'
- && $Config{db_version_major} == 1
- && $Config{db_version_minor} == 0
- && $Config{db_version_patch} == 0) {
+ use DB_File;
+ if ($^O eq 'darwin' && ($DB_File::db_version < 2)) {
warn <<EOM;
#
# This test is known to crash in Mac OS X versions 10.2 (or earlier)
@@ -31,7 +29,6 @@ EOM
}
}
-use DB_File;
use Fcntl;
print "1..177\n";
diff --git a/t/lib/db-recno.t b/t/lib/db-recno.t
index bac08a0ced..d15dea13eb 100755
--- a/t/lib/db-recno.t
+++ b/t/lib/db-recno.t
@@ -106,10 +106,7 @@ sub bad_one
# Some older versions of Berkeley DB version 1 will fail db-recno
# tests 61, 63, 64 and 65.
EOM
- if ($^O eq 'darwin'
- && $Config{db_version_major} == 1
- && $Config{db_version_minor} == 0
- && $Config{db_version_patch} == 0) {
+ if ($^O eq 'darwin' && ($DB_File::db_version || 0) < 2) {
print STDERR <<EOM ;
#
# For example Mac OS X 10.2 (or earlier) has such an old