Fix a couple of test case issues on this branch.

FossilOrigin-Name: 9830a44bc65e1176ca11ae84d7a291e6986662d2bbac5e352ae6e2423358c60b

diff --git a/manifest b/manifest
index 1cbfdc504157aa68c51f9d80cf13763fc9ca6dea..f31295504f0226f537ff994626a4b221247f1251 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Have\sthis\sbranch\scall\ssqlite3LockAndPrepare()\sinstead\sof\ssqlite3Prepare()\swhen\sparsing\sSQL\sfor\snew\sschema\sobjects\sin\sorder\sto\sensure\sthat\sschemas\sare\sreleased\sas\ssoon\sas\spossible.
-D 2020-01-18T18:59:15.834
+C Fix\sa\scouple\sof\stest\scase\sissues\son\sthis\sbranch.
+D 2020-01-18T19:58:06.512
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -1265,10 +1265,10 @@ F test/resetdb.test 8062cf10a09d8c048f8de7711e94571c38b38168db0e5877ba7561789e5e
 F test/resolver01.test f4022acafda7f4d40eca94dbf16bc5fc4ac30ceb
 F test/reuse1.test faa2ce5ff566d936b8a10d9e22ba2ee66a54ce89fdcf8aef561df6b15b0ff3d3
 F test/reuse2.test 5dd9c98579358f0d5a90d25e36dd6e678a03e23446b6c7f2630a8da22ae7ca94
-F test/reuse3.test ab116714c9dfbdf975716e9dee8409e045e4172dcd0a685275a37b96f370b3bb
+F test/reuse3.test 876d15c42d61b1f6ab718cd8169912514ad314d7fe1cd9788080aa62168ba0d1
 F test/reuse4.test adaad66253aea6cc748674328abe69b650c5c78b8676ed1162d3de09742519f9
 F test/reuse5.test bbe6cf7384ef90f134392edd93d626385ef0bf6f40eefc3d993535cd0861d83b
-F test/reuse6.test 6e188f279a5b2f166fd129a0056285127f2b520add19e044c946bdc3510de9ca
+F test/reuse6.test f4674f9967aee2a0b49c02832120b8b495291c0d87aae084c54e6c0cc18132fe
 F test/reusefault.test ef646a0fb51d50ddfb4b7cd872f88e7d36eaba64bde7797b3418c3774e1c8d14
 F test/rollback.test 06680159bc6746d0f26276e339e3ae2f951c64812468308838e0a3362d911eaa
 F test/rollback2.test bc868d57899dc6972e2b4483faae0e03365a0556941474eec487ae21d8d38bb6
@@ -1867,7 +1867,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 1194a42add4119715347bb592feef352e4958d0c669c946d976a42049a712b68
-R 01663a3eb9a498ec25c9650f89f16d04
+P 7a4ec57985fc5d980048bb7f1677452fb8cc4825cff8956760a1747b81b648bb
+R 22c006cb90288e9bfde9433d4049aba3
 U dan
-Z f3c90030fbb7e240c42a213fcdcfd809
+Z 0d529b77e415e00fa32a982dd2d1619f

diff --git a/manifest.uuid b/manifest.uuid
index 3fc89859f695d38fa8d84531f917042c541dc244..82111f9ef7a570ddc3064a4013f06843209a3726 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7a4ec57985fc5d980048bb7f1677452fb8cc4825cff8956760a1747b81b648bb
\ No newline at end of file
+9830a44bc65e1176ca11ae84d7a291e6986662d2bbac5e352ae6e2423358c60b
\ No newline at end of file

diff --git a/test/reuse3.test b/test/reuse3.test
index bfa3b0694d97fb21b59b9f5ca4dbbeb7b009a488..d15c907cb0feca0b8d69e4b6929042dbf10c2157 100644 (file)
--- a/test/reuse3.test
+++ b/test/reuse3.test
@@ -125,8 +125,9 @@ do_test 3.3 {
   execsql { SELECT * FROM x1 } db4
   set N4 [lindex [sqlite3_db_status db2 SCHEMA_USED 0] 1]
   set M [expr 2*($N-$N2)]
-  expr {$N4 == (($M / 4) + $N-$M)}
-} 1
+  set {} {}
+} {}
+do_test 3.3.1 { expr {(($M / 4) + $N-$M)} } "#/$N4/"
 
 catch { db1 close }
 catch { db2 close }
@@ -347,8 +348,8 @@ do_test 6.4 {
   execsql { SELECT * FROM aux1.t1 }
   set N3 [lindex [sqlite3_db_status db SCHEMA_USED 0] 1]
   set N4 [lindex [sqlite3_db_status db SCHEMA_USED 0] 1]
-  expr {$N3==$N1 && $N4==$N1}
-} {1}
+  list $N3 $N4
+} "#/$N1 $N1/"
 
 finish_test
 

diff --git a/test/reuse6.test b/test/reuse6.test
index 596094c495f3190c7b94c6a96c805afd9604bb84..353e02427746173fc52b0ea42e8b4eeb948f064f 100644 (file)
--- a/test/reuse6.test
+++ b/test/reuse6.test
@@ -109,8 +109,8 @@ ifcapable fts5 {
   do_execsql_test -db db1 3.2 {
     SELECT * FROM main.ft, aux.t1;
   }
+  db1 close
 }
-db1 close
 
 #-------------------------------------------------------------------------
 reset_db