Coverage improvements for main.c. (CVS 3023)

FossilOrigin-Name: 50964ef9b0159bfdcd7eae88b0806957cab184dc

diff --git a/manifest b/manifest
index 4bb4e90fd716f777aa5ec8afc12a4e2cd22e6c72..2859cdfe957188314495fda9d4af8fb29f414316 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C General\stest\scoverage\simprovements.\s(CVS\s3022)
-D 2006-01-24T10:58:22
+C Coverage\simprovements\sfor\smain.c.\s(CVS\s3023)
+D 2006-01-24T11:30:27
 F Makefile.in 53841eb72e9eeb6030a8ce28c2595a92f440fd10
 F Makefile.linux-gcc 74ba0eadf88748a9ce3fd03d2a3ede2e6715baec
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -227,8 +227,8 @@ F test/select6.test d8ea108b65607399580f2765df0aee5e464b0fd8
 F test/select7.test 1bf795b948c133a15a2a5e99d3270e652ec58ce6
 F test/server1.test e328b8e641ba8fe9273132cfef497383185dc1f5
 F test/shared.test 0ed247941236788c255b3b29b5a82d5ca71b6432
-F test/shared2.test 909fc0f0277684ed29cc1b36c8e159188aec7f28
-F test/shared_err.test 7bc1c8fa8a8c25fd6f7af8541d02cf6ebdb4b1e0
+F test/shared2.test 995efd4b78e9198f67717d87f88acb193aeb5fd7
+F test/shared_err.test 162ad76d510370e4d3878cb6c376e1292db06005
 F test/sort.test 0e4456e729e5a92a625907c63dcdedfbe72c5dc5
 F test/subquery.test ae324ee928c5fb463a3ce08a8860d6e7f1ca5797
 F test/subselect.test 2d13fb7f450db3595adcdd24079a0dd1d2d6abc2
@@ -344,7 +344,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl a99cf5f6d8bd4d5537584a2b342f0fb9fa601d8b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P 388b9262281308d0a9dd16e2fb3df3425c2a491a
-R a57aac9d19a26b897ebc5facba2c16a4
+P 153940af5af4f775fa3b1784931d3fd1e41764c5
+R 808f7cf1b6819c6083583a3c88c10faa
 U danielk1977
-Z 44dd13cc4a0c64f905d66d184bb2463e
+Z 0d98e456d7f981b2795b996f007cd430

diff --git a/manifest.uuid b/manifest.uuid
index 941989535f18fcec15f8d90708e84fe9d1d10998..7d62b31f9d20b5705d4cbf3588ee753834ebce04 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-153940af5af4f775fa3b1784931d3fd1e41764c5
\ No newline at end of file
+50964ef9b0159bfdcd7eae88b0806957cab184dc
\ No newline at end of file

diff --git a/test/shared2.test b/test/shared2.test
index c77010440b4b43b58a04627db6b505985f10c5a8..ab76517a9acca3da10847a0029ad73c7ca35137f 100644 (file)
--- a/test/shared2.test
+++ b/test/shared2.test
@@ -9,7 +9,7 @@
 #
 #***********************************************************************
 #
-# $Id: shared2.test,v 1.1 2006/01/19 08:43:32 danielk1977 Exp $
+# $Id: shared2.test,v 1.2 2006/01/24 11:30:27 danielk1977 Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -81,5 +81,10 @@ do_test shared2-1.3 {
 db1 close
 db2 close
 
+do_test shared2-1.4 {
+  sqlite3_thread_cleanup
+  sqlite3_enable_shared_cache 1
+} {0}
+
 sqlite3_enable_shared_cache $::enable_shared_cache
 finish_test

diff --git a/test/shared_err.test b/test/shared_err.test
index 29a2bc0c3489fc03c5a5d5132007ef6c51d01389..30fa24d37a3321fe50660176c4a26bea0a41ca5a 100644 (file)
--- a/test/shared_err.test
+++ b/test/shared_err.test
@@ -13,7 +13,7 @@
 # cache context. What happens to connection B if one connection A encounters
 # an IO-error whilst reading or writing the file-system?
 #
-# $Id: shared_err.test,v 1.7 2006/01/24 00:15:16 drh Exp $
+# $Id: shared_err.test,v 1.8 2006/01/24 11:30:27 danielk1977 Exp $
 
 proc skip {args} {}
 
@@ -333,6 +333,22 @@ do_malloc_test 5 -tclbody {
   catch {dbY close}
 }
 
+do_malloc_test 6 -tclbody {
+  catch {db close}
+  sqlite3_thread_cleanup
+  sqlite3_enable_shared_cache 0
+} -cleanup {
+  sqlite3_enable_shared_cache 1
+}
+
+do_test shared_misuse-7.1 {
+  sqlite3 db test.db
+  catch {
+    sqlite3_enable_shared_cache 0
+  } msg
+  set msg
+} {library routine called out of sequence}
+
 catch {db close}
 sqlite3_enable_shared_cache $::enable_shared_cache
 finish_test