diff options
author | Jarkko Hietaniemi <jhi@iki.fi> | 2001-07-21 23:02:30 +0000 |
---|---|---|
committer | Jarkko Hietaniemi <jhi@iki.fi> | 2001-07-21 23:02:30 +0000 |
commit | d536870a93a670c31df812c6614c7c6180896307 (patch) | |
tree | 5cf1ec99d15073af4134c26ed80b01caf736cefb /ext/DB_File | |
parent | 52e18b1f277416a33dff2c066a83fdab0520a2d7 (diff) | |
download | perl-d536870a93a670c31df812c6614c7c6180896307.tar.gz |
Integrate change #11388 from macperl (the *.t parts needed hand massage).
p4raw-link: @11388 on //depot/maint-5.6/macperl: fa1e76071cf9cd14bdc552967af2da831117260a
p4raw-id: //depot/perl@11432
p4raw-branched: from //depot/maint-5.6/macperl@11423 'branch in'
macos/MacPerlTests.cmd (@11243..)
p4raw-branched: from //depot/maint-5.6/macperl@11388 'branch in'
macos/xsubpp.patch (@11243..)
Diffstat (limited to 'ext/DB_File')
-rwxr-xr-x | ext/DB_File/t/db-btree.t | 3 | ||||
-rwxr-xr-x | ext/DB_File/t/db-hash.t | 3 | ||||
-rwxr-xr-x | ext/DB_File/t/db-recno.t | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/ext/DB_File/t/db-btree.t b/ext/DB_File/t/db-btree.t index 4b4a7967ee..2374810968 100755 --- a/ext/DB_File/t/db-btree.t +++ b/ext/DB_File/t/db-btree.t @@ -142,7 +142,8 @@ ok(19, $X = tie(%h, 'DB_File',$Dfile, O_RDWR|O_CREAT, 0640, $DB_BTREE )) ; my ($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size,$atime,$mtime,$ctime, $blksize,$blocks) = stat($Dfile); -ok(20, ($mode & 0777) == ($^O eq 'os2' ? 0666 : 0640) || $^O eq 'amigaos' || $^O eq 'MSWin32' || $^O eq 'NetWare'); +ok(20, ($mode & 0777) == (($^O eq 'os2' || $^O eq 'MacOS') ? 0666 : 0640) + || $^O eq 'amigaos' || $^O eq 'MSWin32' || $^O eq 'NetWare'); my ($key, $value, $i); while (($key,$value) = each(%h)) { diff --git a/ext/DB_File/t/db-hash.t b/ext/DB_File/t/db-hash.t index 6f2ef37b61..1dbb21d5f1 100755 --- a/ext/DB_File/t/db-hash.t +++ b/ext/DB_File/t/db-hash.t @@ -108,7 +108,8 @@ ok(15, $X = tie(%h, 'DB_File',$Dfile, O_RDWR|O_CREAT, 0640, $DB_HASH ) ); my ($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size,$atime,$mtime,$ctime, $blksize,$blocks) = stat($Dfile); -ok(16, ($mode & 0777) == ($^O eq 'os2' ? 0666 : 0640) || $^O eq 'amigaos' || $^O eq 'MSWin32' || $^O eq 'NetWare'); +ok(16, ($mode & 0777) == (($^O eq 'os2' || $^O eq 'MacOS') ? 0666 : 0640) || + $^O eq 'amigaos' || $^O eq 'MSWin32' || $^O eq 'NetWare'); my ($key, $value, $i); while (($key,$value) = each(%h)) { diff --git a/ext/DB_File/t/db-recno.t b/ext/DB_File/t/db-recno.t index 6dd913cfc2..13c635591a 100755 --- a/ext/DB_File/t/db-recno.t +++ b/ext/DB_File/t/db-recno.t @@ -152,7 +152,7 @@ my $X ; my @h ; ok(17, $X = tie @h, 'DB_File', $Dfile, O_RDWR|O_CREAT, 0640, $DB_RECNO ) ; -ok(18, ((stat($Dfile))[2] & 0777) == ($^O eq 'os2' ? 0666 : 0640) +ok(18, ((stat($Dfile))[2] & 0777) == (($^O eq 'os2' || $^O eq 'MacOS') ? 0666 : 0640) || $^O eq 'MSWin32' || $^O eq 'NetWare' || $^O eq 'amigaos') ; #my $l = @h ; |