Fix the finish_test proc in tester.tcl so that it works for Windows test

builds.  Fix for problem introduced yesterday by check-in [3658417bf300e004].

FossilOrigin-Name: f52b84e69e5fcbe59ccc6163e7e78aa3822f2c354c88f8a76a2d1d4c90a99821

diff --git a/manifest b/manifest
index cebb076c9f9a3af758c8e521ef48eb0bab69c48b..8655020c1b53106f8f9462bed92d1ca99a163913 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Enabled\sthe\stestcase()\smacros\sunder\sSQLITE_DEBUG.
-D 2021-10-20T17:58:33.677
+C Fix\sthe\sfinish_test\sproc\sin\stester.tcl\sso\sthat\sit\sworks\sfor\sWindows\stest\nbuilds.\s\sFix\sfor\sproblem\sintroduced\syesterday\sby\scheck-in\s[3658417bf300e004].
+D 2021-10-20T18:17:31.262
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -1461,7 +1461,7 @@ F test/temptable.test d2c9b87a54147161bcd1822e30c1d1cd891e5b30
 F test/temptable2.test d2940417496e2b9548e01d09990763fbe88c316504033256d51493e1f1a5ce6a
 F test/temptable3.test d11a0974e52b347e45ee54ef1923c91ed91e4637
 F test/temptrigger.test 38f0ca479b1822d3117069e014daabcaacefffcc
-F test/tester.tcl 2b55f29390d187026f187b5b82849a4001763960e5e90797ba2dc95c70fe77a6
+F test/tester.tcl f577d040078dd4fb56ea1ccaa71f6bfd0ebf0bd0ac373304db4269b5474f9cb7
 F test/thread001.test b61a29dd87cf669f5f6ac96124a7c97d71b0c80d9012746072055877055cf9ef
 F test/thread002.test e630504f8a06c00bf8bbe68528774dd96aeb2e58
 F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7
@@ -1929,7 +1929,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P cac910c15f409c5358843643b2f90252eb90328b9e5ff84cedbccb604d9891af
-R b58b0d6940cbb987a3db5591c7793ff3
+P 0ae8dd132db8331ca9cc42ad511066924f9d3a1d158ecdb630cebc41b6bd2493
+R 3118246a821316ba678380f724f46b08
 U drh
-Z ed1a880f40a6b2e9669ca472c69ec5e6
+Z e61d5b6226e546ad207433c5c688d2ff

diff --git a/manifest.uuid b/manifest.uuid
index 5cb2a44d836864b05ef353c07d85bdf291b4298f..745bb973add0017aa0276bb3ff6aa923b352300d 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0ae8dd132db8331ca9cc42ad511066924f9d3a1d158ecdb630cebc41b6bd2493
\ No newline at end of file
+f52b84e69e5fcbe59ccc6163e7e78aa3822f2c354c88f8a76a2d1d4c90a99821
\ No newline at end of file

diff --git a/test/tester.tcl b/test/tester.tcl
index 68bff929cdf7a11ebb26b2390ee372daadcd7d88..bfcc831ff91401c46e1d3118c523041badf5a78d 100644 (file)
--- a/test/tester.tcl
+++ b/test/tester.tcl
@@ -1209,9 +1209,9 @@ proc finish_test_precleanup {} {
   catch {db1 close}
   catch {db2 close}
   catch {db3 close}
-  unregister_devsim
-  unregister_jt_vfs
-  unregister_demovfs
+  catch {unregister_devsim}
+  catch {unregister_jt_vfs}
+  catch {unregister_demovfs}
 }
 
 # Run this routine last