Modify a few test scripts to avoid leaving the sqlite3Config structure in a non-defau...

FossilOrigin-Name: 562687d9f56bf4bb0f5f07f97cbbb7649c81faf8

diff --git a/manifest b/manifest
index fb1043c3f430ee6c3ec72559819d66cb118ca04e..240c60a50c26afb3892cb7ef08d63e9ac9a0dded 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Update\sRBU\sdescription\scomment\sin\sthe\sheader\sfile.\s\sNo\schanges\sto\scode.
-D 2015-07-24T00:02:15.028
+C Modify\sa\sfew\stest\sscripts\sto\savoid\sleaving\sthe\ssqlite3Config\sstructure\sin\sa\snon-default\sstate.
+D 2015-07-24T14:17:17.027
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in b13c653ee215cb0d294ffa4f10ac4d14255767e0
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -362,7 +362,7 @@ F src/test_intarray.c 870124b95ec4c645d4eb84f15efb7133528fb1a5
 F src/test_intarray.h 9dc57417fb65bc7835cc18548852cc08cc062202
 F src/test_journal.c 5360fbe1d1e4416ca36290562fd5a2e3f70f32aa
 F src/test_loadext.c a5251f956ab6af21e138dc1f9c0399394a510cb4
-F src/test_malloc.c 208f09a4e21defa496bc1094fcfadea19385a112
+F src/test_malloc.c e19790f6bdc9be7b75147682153520df7843487a
 F src/test_multiplex.c 9fefd23f6cc3fa9bf0748a5e453167e7b9f193ce
 F src/test_multiplex.h c08e4e8f8651f0c5e0509b138ff4d5b43ed1f5d3
 F src/test_mutex.c dbdfaff8580071f2212a0deae3325a93a737819c
@@ -732,7 +732,7 @@ F test/func5.test cdd224400bc3e48d891827cc913a57051a426fa4
 F test/fuzz-oss1.test 4912e528ec9cf2f42134456933659d371c9e0d74
 F test/fuzz.test 96083052bf5765e4518c1ba686ce2bab785670d1
 F test/fuzz2.test 76dc35b32b6d6f965259508508abce75a6c4d7e1
-F test/fuzz3.test 0d13010d1c13003a3aa57dda2f69b6b71ccac46e
+F test/fuzz3.test 53fabcd5f0f430f8b221282f6c12c4d0903c21eb
 F test/fuzz_common.tcl a87dfbb88c2a6b08a38e9a070dabd129e617b45b
 F test/fuzz_malloc.test 328f70aaca63adf29b4c6f06505ed0cf57ca7c26
 F test/fuzzcheck.c b973b06b500e6fc052d7059257cdf70df1f3a986
@@ -817,13 +817,13 @@ F test/lock5.test c6c5e0ebcb21c61a572870cc86c0cb9f14cede38
 F test/lock6.test ad5b387a3a8096afd3c68a55b9535056431b0cf5
 F test/lock7.test 49f1eaff1cdc491cc5dee3669f3c671d9f172431
 F test/lock_common.tcl 7ffb45accf6ee91c736df9bafe0806a44358f035
-F test/lookaside.test 93f07bac140c5bb1d49f3892d2684decafdc7af2
+F test/lookaside.test 90052e87282de256d613fcf8c9cbb845e4001d2f
 F test/main.test 16131264ea0c2b93b95201f0c92958e85f2ba11a
 F test/make-where7.tcl 05c16b5d4f5d6512881dfec560cb793915932ef9
 F test/malloc.test 21c213365f2cca95ab2d7dc078dc8525f96065f8
 F test/malloc3.test e3b32c724b5a124b57cb0ed177f675249ad0c66a
 F test/malloc4.test 957337613002b7058a85116493a262f679f3a261
-F test/malloc5.test 4e87e596a28908c034eb5777fc33dd921bb44fc3
+F test/malloc5.test 02ed7c5313f0a68d95f2dfca8c8962132bd1f04b
 F test/malloc6.test 2f039d9821927eacae43e1831f815e157659a151
 F test/malloc7.test 7c68a32942858bc715284856c5507446bba88c3a
 F test/malloc8.test 9b7a3f8cb9cf0b12fff566e80a980b1767bd961d
@@ -846,7 +846,7 @@ F test/manydb.test 28385ae2087967aa05c38624cec7d96ec74feb3e
 F test/mem5.test c6460fba403c5703141348cd90de1c294188c68f
 F test/memdb.test c1f2a343ad14398d5d6debda6ea33e80d0dafcc7
 F test/memleak.test 10b9c6c57e19fc68c32941495e9ba1c50123f6e2
-F test/memsubsys1.test 1733c617e246642db5bf3b9f78c18e2b14fac96c
+F test/memsubsys1.test d2b2d6ca37890b26703a2258df8fd66f9869da02
 F test/memsubsys2.test 3a1c1a9de48e5726faa85108b02459fae8cb9ee9
 F test/minmax.test 42fbad0e81afaa6e0de41c960329f2b2c3526efd
 F test/minmax2.test b44bae787fc7b227597b01b0ca5575c7cb54d3bc
@@ -900,9 +900,9 @@ F test/pagerfault3.test 1003fcda009bf48a8e22a516e193b6ef0dd1bbd8
 F test/pageropt.test 6b8f6a123a5572c195ad4ae40f2987007923bbd6
 F test/pagesize.test 5769fc62d8c890a83a503f67d47508dfdc543305
 F test/pcache.test c8acbedd3b6fd0f9a7ca887a83b11d24a007972b
-F test/pcache2.test c70d92547550136ba6f818e6a44fe246d2738604
+F test/pcache2.test af7f3deb1a819f77a6d0d81534e97d1cf62cd442
 F test/percentile.test 4243af26b8f3f4555abe166f723715a1f74c77ff
-F test/permutations.test 04004bd977f66c064f27e6d18edadce486cf5074
+F test/permutations.test ac3b00c299250cc087d4a527b5c75a0f8aef4e54
 F test/pragma.test be7195f0aa72bdb8a512133e9640ac40f15b57a2
 F test/pragma2.test f624a496a95ee878e81e59961eade66d5c00c028
 F test/pragma3.test 6f849ccffeee7e496d2f2b5e74152306c0b8757c
@@ -1028,7 +1028,7 @@ F test/tclsqlite.test 7fb866443c7deceed22b63948ccd6f76b52ad054
 F test/tempdb.test 19d0f66e2e3eeffd68661a11c83ba5e6ace9128c
 F test/temptable.test d2c9b87a54147161bcd1822e30c1d1cd891e5b30
 F test/temptrigger.test 8ec228b0db5d7ebc4ee9b458fc28cb9e7873f5e1
-F test/tester.tcl b3a41e20f98a029a76e930b33d0711c5854267bb
+F test/tester.tcl 6d0df5c4e39b76390d967c37c1855cb1d0c454c2
 F test/thread001.test 9f22fd3525a307ff42a326b6bc7b0465be1745a5
 F test/thread002.test e630504f8a06c00bf8bbe68528774dd96aeb2e58
 F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7
@@ -1307,7 +1307,7 @@ F test/without_rowid4.test 4e08bcbaee0399f35d58b5581881e7a6243d458a
 F test/without_rowid5.test 61256715b686359df48ca1742db50cc7e3e7b862
 F test/without_rowid6.test db0dbf03c49030aa3c1ba5f618620334bd2baf5f
 F test/wordcount.c 9915e06cb33d8ca8109b8700791afe80d305afda
-F test/zeroblob.test fb3c0e4ab172d386954deda24c03f500e121d80d
+F test/zeroblob.test dcffae9583ac7a6683e814cc7a9c85b2fd73ddd8
 F test/zerodamage.test cf6748bad89553cc1632be51a6f54e487e4039ac
 F tool/build-all-msvc.bat 9058bd90a3c078a3d8c17d40e853aaa0f47885f4 x
 F tool/build-shell.sh 950f47c6174f1eea171319438b93ba67ff5bf367
@@ -1365,7 +1365,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 017c5019e1ce042025d4f327e50ec50af49f9fa4
-R a8265770104c472748ff94ce6fcf731e
-U mistachkin
-Z 023cdb466d093d6177a784bd88dec4ce
+P 119883a21bdcab66c15d1e80f3da20addda328ad
+R f93dc01dd263cc307f98235646fce28d
+U dan
+Z 1717e31dfb28e99256b065adb47b07f0

diff --git a/manifest.uuid b/manifest.uuid
index 1e35ab89ac31953131fcb2103f9bc3e4dd5920bf..77a88cee9039a64e6220e702cba43fcd312d43aa 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-119883a21bdcab66c15d1e80f3da20addda328ad
\ No newline at end of file
+562687d9f56bf4bb0f5f07f97cbbb7649c81faf8
\ No newline at end of file

diff --git a/src/test_malloc.c b/src/test_malloc.c
index 94a2282923faa2379f020d6f31fef65334199d29..ed46e7a8dbc33ab847bf8867df61fb3adbf99abe 100644 (file)
--- a/src/test_malloc.c
+++ b/src/test_malloc.c
@@ -939,7 +939,7 @@ static int test_config_pagecache(
   Tcl_Obj *CONST objv[]
 ){
   int sz, N, rc;
-  Tcl_Obj *pResult;
+  Tcl_Obj *pRes;
   static char *buf = 0;
   if( objc!=3 ){
     Tcl_WrongNumArgs(interp, 1, objv, "SIZE N");
@@ -948,17 +948,20 @@ static int test_config_pagecache(
   if( Tcl_GetIntFromObj(interp, objv[1], &sz) ) return TCL_ERROR;
   if( Tcl_GetIntFromObj(interp, objv[2], &N) ) return TCL_ERROR;
   free(buf);
+  buf = 0;
+
+  /* Set the return value */
+  pRes = Tcl_NewObj();
+  Tcl_ListObjAppendElement(0, pRes, Tcl_NewIntObj(sqlite3GlobalConfig.szPage));
+  Tcl_ListObjAppendElement(0, pRes, Tcl_NewIntObj(sqlite3GlobalConfig.nPage));
+  Tcl_SetObjResult(interp, pRes);
+
   if( sz<0 ){
-    buf = 0;
     rc = sqlite3_config(SQLITE_CONFIG_PAGECACHE, 0, 0, 0);
   }else{
     buf = malloc( sz*N );
     rc = sqlite3_config(SQLITE_CONFIG_PAGECACHE, buf, sz, N);
   }
-  pResult = Tcl_NewObj();
-  Tcl_ListObjAppendElement(0, pResult, Tcl_NewIntObj(rc));
-  Tcl_ListObjAppendElement(0, pResult, Tcl_NewIntObj(N));
-  Tcl_SetObjResult(interp, pResult);
   return TCL_OK;
 }
 

diff --git a/test/fuzz3.test b/test/fuzz3.test
index e54b81114237740c7088e71bc0720734d892266b..b432671822ea1afd764efd32da4c1f2592ee92a5 100644 (file)
--- a/test/fuzz3.test
+++ b/test/fuzz3.test
@@ -21,12 +21,7 @@ source $testdir/tester.tcl
 # These tests deal with corrupt database files
 #
 database_may_be_corrupt
-db close
-sqlite3_shutdown
-sqlite3_config_pagecache 0 0
-sqlite3_initialize
-autoinstall_test_functions
-sqlite3 db test.db
+test_set_config_pagecache 0 0
 
 
 expr srand(123)
@@ -176,4 +171,6 @@ for {set ii 0} {$ii < 5000} {incr ii} {
   } $::cksum
 }
 
+test_restore_config_pagecache
 finish_test
+

diff --git a/test/lookaside.test b/test/lookaside.test
index 0b239a04d5e1c0bd57b73e24d2c05cfe379f922e..a89110ee1d7bf9510a264670ec22c3d4e65f4a75 100644 (file)
--- a/test/lookaside.test
+++ b/test/lookaside.test
@@ -29,9 +29,10 @@ if {[info exists ::G(perm:presql)]} {
   return
 }
 
+test_set_config_pagecache 0 0
+
 catch {db close}
 sqlite3_shutdown
-sqlite3_config_pagecache 0 0
 sqlite3_config_scratch 0 0
 sqlite3_initialize
 autoinstall_test_functions
@@ -129,4 +130,5 @@ do_test lookaside-4.1 {
 sqlite3_initialize
 autoinstall_test_functions
 
+test_restore_config_pagecache
 finish_test

diff --git a/test/malloc5.test b/test/malloc5.test
index 3f5208accdf98322444c428a527cba4c4e6de690..8f0db04c2a5a2e9d973be4f1820c3708918e34d1 100644 (file)
--- a/test/malloc5.test
+++ b/test/malloc5.test
@@ -20,11 +20,6 @@
 #
 # $Id: malloc5.test,v 1.22 2009/04/11 19:09:54 drh Exp $
 
-sqlite3_shutdown
-sqlite3_config_pagecache 0 100
-sqlite3_initialize
-autoinstall_test_functions
-
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 source $testdir/malloc_common.tcl
@@ -44,6 +39,8 @@ ifcapable !memorymanage {
    return
 }
 
+test_set_config_pagecache 0 100
+
 sqlite3_soft_heap_limit 0
 sqlite3 db test.db
 db eval {PRAGMA cache_size=1}
@@ -415,5 +412,6 @@ do_test malloc5-6.3.6 {
 db2 close
 
 sqlite3_soft_heap_limit $::soft_limit
+test_restore_config_pagecache
 finish_test
 catch {db close}

diff --git a/test/memsubsys1.test b/test/memsubsys1.test
index 3eb3cd4a956aed1b8da647dd0ce9b8b4cf682310..8265ce63174d1ebd8cd23368d9e671902f15cf74 100644 (file)
--- a/test/memsubsys1.test
+++ b/test/memsubsys1.test
@@ -25,6 +25,8 @@ if {[permutation] == "memsubsys1"} {
   return
 }
 
+test_set_config_pagecache 0 0
+
 # This procedure constructs a new database in test.db.  It fills
 # this database with many small records (enough to force multiple
 # rebalance operations in the btree-layer and to require a large
@@ -310,10 +312,11 @@ do_test memsubsys1-8.4 {
 db close
 sqlite3_shutdown
 sqlite3_config_memstatus 1
-sqlite3_config_pagecache 0 0
 sqlite3_config_scratch 0 0
 sqlite3_config_lookaside 100 500
 sqlite3_config serialized
 sqlite3_initialize
 autoinstall_test_functions
+
+test_restore_config_pagecache
 finish_test

diff --git a/test/pcache2.test b/test/pcache2.test
index c59dfb25d436b900fbe01bb0479fe7d7309e3ba6..a0d7496c865de19801257b455dd1f5bee20cf681 100644 (file)
--- a/test/pcache2.test
+++ b/test/pcache2.test
@@ -16,6 +16,8 @@
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 
+test_set_config_pagecache 0 0
+
 # Set up a pcache memory pool so that we can easily track how many
 # pages are being used for cache.
 #
@@ -78,4 +80,5 @@ sqlite3_config serialized
 sqlite3_initialize
 autoinstall_test_functions
 
+test_restore_config_pagecache
 finish_test

diff --git a/test/permutations.test b/test/permutations.test
index e8009dfc05aed91d08a1aed67a087bfd8aba5b99..c01dc22c556afac1a91f6814127fd94bc28da5a0 100644 (file)
--- a/test/permutations.test
+++ b/test/permutations.test
@@ -417,16 +417,16 @@ test_suite "memsubsys1" -description {
 } -files [
   test_set $::allquicktests -exclude ioerr5.test malloc5.test mmap1.test
 ] -initialize {
+  test_set_config_pagecache 4096 24
   catch {db close}
   sqlite3_shutdown
-  sqlite3_config_pagecache 4096 24
   sqlite3_config_scratch 25000 1
   sqlite3_initialize
   autoinstall_test_functions
 } -shutdown {
+  test_restore_config_pagecache
   catch {db close}
   sqlite3_shutdown
-  sqlite3_config_pagecache 0 0
   sqlite3_config_scratch 0 0
   sqlite3_initialize
   autoinstall_test_functions
@@ -444,16 +444,16 @@ test_suite "memsubsys2" -description {
 } -files [
   test_set $::allquicktests -exclude ioerr5.test malloc5.test
 ] -initialize {
+  test_set_config_pagecache 512 5
   catch {db close}
   sqlite3_shutdown
-  sqlite3_config_pagecache 512 5
   sqlite3_config_scratch 1000 1
   sqlite3_initialize
   autoinstall_test_functions
 } -shutdown {
+  test_restore_config_pagecache
   catch {db close}
   sqlite3_shutdown
-  sqlite3_config_pagecache 0 0
   sqlite3_config_scratch 0 0
   sqlite3_initialize
   autoinstall_test_functions

diff --git a/test/tester.tcl b/test/tester.tcl
index 8022d6a53846c5b21db312d71679ada763a7d82d..d83802346eb4c4825b9494b6bafb9a0b7af78919 100644 (file)
--- a/test/tester.tcl
+++ b/test/tester.tcl
@@ -2041,6 +2041,45 @@ proc db_delete_and_reopen {{file test.db}} {
   sqlite3 db $file
 }
 
+# Close any connections named [db], [db2] or [db3]. Then use sqlite3_config
+# to configure the size of the PAGECACHE allocation using the parameters
+# provided to this command. Save the old PAGECACHE parameters in a global 
+# variable so that [test_restore_config_pagecache] can restore the previous
+# configuration.
+#
+# Before returning, reopen connection [db] on file test.db.
+#
+proc test_set_config_pagecache {sz nPg} {
+  catch {db close}
+  catch {db2 close}
+  catch {db3 close}
+
+  sqlite3_shutdown
+  set ::old_pagecache_config [sqlite3_config_pagecache $sz $nPg]
+  sqlite3_initialize
+  autoinstall_test_functions
+  sqlite3 db test.db
+}
+
+# Close any connections named [db], [db2] or [db3]. Then use sqlite3_config
+# to configure the size of the PAGECACHE allocation to the size saved in
+# the global variable by an earlier call to [test_set_config_pagecache].
+#
+# Before returning, reopen connection [db] on file test.db.
+#
+proc test_restore_config_pagecache {} {
+  catch {db close}
+  catch {db2 close}
+  catch {db3 close}
+
+  sqlite3_shutdown
+  eval sqlite3_config_pagecache $::old_pagecache_config
+  unset ::old_pagecache_config 
+  sqlite3_initialize
+  autoinstall_test_functions
+  sqlite3 db test.db
+}
+
 # If the library is compiled with the SQLITE_DEFAULT_AUTOVACUUM macro set
 # to non-zero, then set the global variable $AUTOVACUUM to 1.
 set AUTOVACUUM $sqlite_options(default_autovacuum)

diff --git a/test/zeroblob.test b/test/zeroblob.test
index e70fd0b748491d36a01b1656f0915dba0320d8f1..c40ad47524ecf9e95612ca683f19e79623de9468 100644 (file)
--- a/test/zeroblob.test
+++ b/test/zeroblob.test
@@ -23,6 +23,8 @@ ifcapable !incrblob {
   return
 }
 
+test_set_config_pagecache 0 0
+
 # When zeroblob() is used for the last field of a column, then the
 # content of the zeroblob is never instantiated on the VDBE stack.
 # But it does get inserted into the database correctly.
@@ -41,6 +43,7 @@ do_test zeroblob-1.1 {
   }
   set ::sqlite3_max_blobsize
 } {10}
+
 do_test zeroblob-1.1.1 {
   expr {[sqlite3_memory_highwater]<$::memused+25000}
 } {1}
@@ -265,4 +268,5 @@ do_test zeroblob-10.1 {
 } {1 {string or blob too big}}
 
 
+test_restore_config_pagecache
 finish_test