Fix a problem with the previous change to malloc_common.tcl.

FossilOrigin-Name: e07a33ea0fd50d56f2d00965c754e652c48f32fb

diff --git a/manifest b/manifest
index 4db8d9c61bfcf6e66a9d147ea991fcce06d036f5..453da712dc440686d50662a7992d732de7f5c8ea 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Change\scode\sin\smalloc_common.tcl\s(test\scode)\sto\sretry\sa\s"file\sdelete\s-force"\sif\nit\sfails.
-D 2010-09-16T15:23:07
+C Fix\sa\sproblem\swith\sthe\sprevious\schange\sto\smalloc_common.tcl.
+D 2010-09-16T15:58:12
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in c599a15d268b1db2aeadea19df2adc3bf2eb6bee
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -633,7 +633,7 @@ F test/tclsqlite.test 8c154101e704170c2be10f137a5499ac2c6da8d3
 F test/tempdb.test 800c36623d67a2ad1f58784b9c5644e0405af6e6
 F test/temptable.test f42121a0d29a62f00f93274464164177ab1cc24a
 F test/temptrigger.test b0273db072ce5f37cf19140ceb1f0d524bbe9f05
-F test/tester.tcl d0c7b39c374156f3a37eeeb83af279c41c60ecbc
+F test/tester.tcl 87ddf74a6eb417191f095861c0b02f6feafcebd8
 F test/thread001.test a3e6a7254d1cb057836cb3145b60c10bf5b7e60f
 F test/thread002.test afd20095e6e845b405df4f2c920cb93301ca69db
 F test/thread003.test b824d4f52b870ae39fc5bae4d8070eca73085dca
@@ -857,7 +857,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 78f659ee9bb60df3503998301b554fe81fa6bdd3
-R ee96a2d4950e0abaf03c37482918b8c3
+P ebfb04f00c839601d92d33b9c2305fc4ce869bbc
+R e0455f0f518f5d2f0f6b90ba3530b59d
 U dan
-Z 9971ebfc8719fca164d2b024c4c43a5a
+Z 654d273311d3d19636135ef1ea6d7831

diff --git a/manifest.uuid b/manifest.uuid
index 0883d4ae2e59634bbbf0ce0dcb229fc31c72fef7..1f80a219c21565f1a9dd454151bfaaa7feffbd33 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ebfb04f00c839601d92d33b9c2305fc4ce869bbc
\ No newline at end of file
+e07a33ea0fd50d56f2d00965c754e652c48f32fb
\ No newline at end of file

diff --git a/test/tester.tcl b/test/tester.tcl
index 3cac7c32559fc2f2b13a900f2db24815e21b0448..bfc938d4a32ff3496037e78733119b24b6a249c8 100644 (file)
--- a/test/tester.tcl
+++ b/test/tester.tcl
@@ -611,9 +611,10 @@ proc forcedelete {filename} {
   #
   set nRetry  50                  ;# Maximum number of retries.
   set nDelay 100                  ;# Delay in ms before retrying.
-  set rc 1
-  for {set i 0} {$i<$nRetry && $rc} {incr i} {
+  for {set i 0} {$i<$nRetry} {incr i} {
     set rc [catch {file delete -force $filename} msg]
+    if {$rc==0} continue
+    after $nDelay
   }
   if {$rc} { error $msg }
 }