More test script changes to get it to run without -DSQLITE_MEMDEBUG. (CVS 3018)

FossilOrigin-Name: 0ede5e496bc779e96f05602bebadd10f8a208d48

diff --git a/manifest b/manifest
index c36ee323793764df5ed0f91d82f26f52d937bf48..9e9152016ea48d1f52a0e868ded7da5ede4bed26 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Change\sthe\srelease\sdate\sfor\sversion\s3.3.2\sto\sJanuary\s24.\s(CVS\s3017)
-D 2006-01-23T23:53:17
+C More\stest\sscript\schanges\sto\sget\sit\sto\srun\swithout\s-DSQLITE_MEMDEBUG.\s(CVS\s3018)
+D 2006-01-24T00:15:16
 F Makefile.in 53841eb72e9eeb6030a8ce28c2595a92f440fd10
 F Makefile.linux-gcc 74ba0eadf88748a9ce3fd03d2a3ede2e6715baec
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -228,7 +228,7 @@ 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 c8a5b717178bca3f1f4cccebd167b08252833307
+F test/shared_err.test 7bc1c8fa8a8c25fd6f7af8541d02cf6ebdb4b1e0
 F test/sort.test 0e4456e729e5a92a625907c63dcdedfbe72c5dc5
 F test/subquery.test ae324ee928c5fb463a3ce08a8860d6e7f1ca5797
 F test/subselect.test 2d13fb7f450db3595adcdd24079a0dd1d2d6abc2
@@ -236,7 +236,7 @@ F test/sync.test 0c43399676de101e3af4d6069a94e211bb77f6b9
 F test/table.test 6dc0dfa44dd429520e0e5a0c5e55025f730e9403
 F test/tableapi.test 6a66d58b37d46dc0f2b3c7d4bd2617d209399bd1
 F test/tclsqlite.test 9b5c4a09879a97572e5c84372f5d045dd4703392
-F test/temptable.test 7927261befdbc7b0a7ffebb85ecc70a74fa7b15b
+F test/temptable.test c36f3e5a94507abb64f7ba23deeb4e1a8a8c3821
 F test/tester.tcl 0a939262ccb0b87449f98d8780396a4c293831b0
 F test/thread1.test 776c9e459b75ba905193b351926ac4019b049f35
 F test/thread2.test 6d7b30102d600f51b4055ee3a5a19228799049fb
@@ -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 2d896667e460dcdaf83d18bd03050e917d54edc7
-R 6ca3af49120dacc86427ba0773bf9d85
+P 7a2617f6a5990dc711cacc993d7a91e4d7b6a815
+R aeb8e31d2337a89e74930e20ea61b258
 U drh
-Z b32a0e21e59fef4d86a584d6ddfeba8d
+Z 0d54f3e3344700c939657c49746571f7

diff --git a/manifest.uuid b/manifest.uuid
index f6283b10903df9add9f6d680ff001166ee1904f7..289e4a640f4a987b8500df617f8c8197c8ea7b2f 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7a2617f6a5990dc711cacc993d7a91e4d7b6a815
\ No newline at end of file
+0ede5e496bc779e96f05602bebadd10f8a208d48
\ No newline at end of file

diff --git a/test/shared_err.test b/test/shared_err.test
index 9a0478836cb0e912548171eb40dc6cbc08bf4974..29a2bc0c3489fc03c5a5d5132007ef6c51d01389 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.6 2006/01/23 23:49:34 drh Exp $
+# $Id: shared_err.test,v 1.7 2006/01/24 00:15:16 drh Exp $
 
 proc skip {args} {}
 
@@ -273,6 +273,8 @@ do_ioerr_test shared_ioerr-3 -tclprep {
 #
 if {[info command sqlite_malloc_stat]==""} {
    puts "Skipping malloc tests: not compiled with -DSQLITE_MEMDEBUG..."
+   db close
+   sqlite3_enable_shared_cache $::enable_shared_cache
    finish_test
    return
 }

diff --git a/test/temptable.test b/test/temptable.test
index dae1db62e7d90f47bbf1f120fda877e09cdf89f5..363f99940f3b16fa3f065d494ccd3fd8ab74074e 100644 (file)
--- a/test/temptable.test
+++ b/test/temptable.test
@@ -12,7 +12,7 @@
 #
 # This file implements tests for temporary tables and indices.
 #
-# $Id: temptable.test,v 1.16 2005/08/20 03:03:04 drh Exp $
+# $Id: temptable.test,v 1.17 2006/01/24 00:15:16 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -403,6 +403,7 @@ do_test temptable-6.8 {
   }
 } {1 {no such table: t9}}
 
+file delete -force test2.db test2.db-journal
 do_test temptable-7.1 {
   catchsql {
     ATTACH 'test2.db' AS two;