Upgrade to ExtUtils::MakeMaker 6.28

[p5sagit/p5-mst-13.2.git] / lib / Memoize / t / tie.t

diff --git a/lib/Memoize/t/tie.t b/lib/Memoize/t/tie.t
index 098fb05..02c20d6 100755 (executable)
--- a/lib/Memoize/t/tie.t
+++ b/lib/Memoize/t/tie.t
@@ -3,7 +3,13 @@
 use lib qw(. ..);
 use Memoize 0.52 qw(memoize unmemoize);
 use Fcntl;
-use Memoize::AnyDBM_File;
+eval {require Memoize::AnyDBM_File};
+if ($@) {
+  print "1..0\n";
+  exit 0;
+}
+
+
 
 print "1..4\n";
 
@@ -23,33 +29,24 @@ sub n {
   $_[0]+1;
 }
 
-$tmpdir = $ENV{TMP} || $ENV{TMPDIR} ||  '/tmp';  
-if (eval {require File::Spec::Functions}) {
- File::Spec::Functions->import();
-} else {
-  *catfile = sub { join '/', @_ };
-}
-$file = catfile($tmpdir, "md$$");
+$file = "md$$";
 @files = ($file, "$file.db", "$file.dir", "$file.pag");
-{ 
-  my @present = grep -e, @files;
-  if (@present && (@failed = grep { not unlink } @present)) {
-    warn "Can't unlink @failed!  ($!)";
-  }
-}
+1 while unlink @files;
 
 
 tryout('Memoize::AnyDBM_File', $file, 1);  # Test 1..4
 # tryout('DB_File', $file, 1);  # Test 1..4
-unlink $file, "$file.dir", "$file.pag";
+1 while unlink $file, "$file.dir", "$file.pag";
 
 sub tryout {
   my ($tiepack, $file, $testno) = @_;
 
+  tie my %cache => $tiepack, $file, O_RDWR | O_CREAT, 0666
+    or die $!;
 
   memoize 'c5', 
-  SCALAR_CACHE => ['TIE', $tiepack, $file, O_RDWR | O_CREAT, 0666], 
-  LIST_CACHE => 'FAULT'
+    SCALAR_CACHE => [HASH => \%cache],
+    LIST_CACHE => 'FAULT'
     ;
 
   my $t1 = c5($ARG);   
@@ -62,7 +59,7 @@ sub tryout {
   # Now something tricky---we'll memoize c23 with the wrong table that
   # has the 5 already cached.
   memoize 'c23', 
-  SCALAR_CACHE => ['TIE', $tiepack, $file, O_RDWR, 0666], 
+  SCALAR_CACHE => ['HASH', \%cache],
   LIST_CACHE => 'FAULT'
     ;