unstable merge conflicts resolved

[redis.git] / tests / support / tmpfile.tcl

diff --git a/tests/support/tmpfile.tcl b/tests/support/tmpfile.tcl
index 809f587306c68f6adeceba36fcbd30d90782c5a4..287b093177098371336c2df486c9eb61a8cc1ae0 100644 (file)
--- a/tests/support/tmpfile.tcl
+++ b/tests/support/tmpfile.tcl
@@ -4,7 +4,13 @@ file mkdir $::tmproot
 
 # returns a dirname unique to this process to write to
 proc tmpdir {basename} {
 
 # returns a dirname unique to this process to write to
 proc tmpdir {basename} {

-    set dir [file join $::tmproot $basename.[pid].[incr ::tmpcounter]]
+    if {$::diskstore} {
+        # For diskstore we want to use the same dir again and again
+        # otherwise everything is too slow.
+        set dir [file join $::tmproot $basename.diskstore]
+    } else {
+        set dir [file join $::tmproot $basename.[pid].[incr ::tmpcounter]]
+    }

     file mkdir $dir
     set _ $dir
 }
     file mkdir $dir
     set _ $dir
 }