In rollback.test, do not check for journal deletion if the journal mode

is not DELETE.  Call show_memstats after each test module in all.test
and quick.test. (CVS 5814)

FossilOrigin-Name: df2c28dc7310510bada292a2e8c1be073803858c

diff --git a/manifest b/manifest
index b6707668732942bf733b08d1c89982edeb8ef7b8..5a13cef345148f72533f7b7fdd0bb1e5d4389c09 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Use\sone\sless\stemporary\stable\sin\sgenfkey.c.\sThe\sretired\stable\swas\sbeing\sused\sto\sworkaround\sthe\sbug\sfixed\sby\s(5812).\s(CVS\s5813)
-D 2008-10-13T10:56:48
+C In\srollback.test,\sdo\snot\scheck\sfor\sjournal\sdeletion\sif\sthe\sjournal\smode\nis\snot\sDELETE.\s\sCall\sshow_memstats\safter\seach\stest\smodule\sin\sall.test\nand\squick.test.\s(CVS\s5814)
+D 2008-10-13T14:16:11
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 2014e5a4010ad5ebbcaedff98240b3d14ee83838
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -204,7 +204,7 @@ F src/where.c 76bc0a7a5eb2e20b72b644f7c5f104c285143a54
 F tclinstaller.tcl 4356d9d94d2b5ed5e68f9f0c80c4df3048dd7617
 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
 F test/alias.test c321c114a8a31a33e3cbda910fa39949f5d9dcb2
-F test/all.test e15e9df483e1a72ac0c9d6cad216c4c0bdc1c1c9
+F test/all.test 03cdd58d389e35bee8d57b7d24357b827aecc463
 F test/alter.test 6353aae6839e486c9b7d8f73b1f4a1e98e57332c
 F test/alter2.test dd55146e812622c8fc51fd2216bcd8dca8880752
 F test/alter3.test 25b95a136708f22b87184fa6a4309eea03d65153
@@ -463,11 +463,11 @@ F test/pragma2.test 5364893491b9231dd170e3459bfc2e2342658b47
 F test/printf.test 262a5acd3158f788e9bdf7f18d718f3af32ff6ef
 F test/progress.test 5b075c3c790c7b2a61419bc199db87aaf48b8301 x
 F test/ptrchng.test ef1aa72d6cf35a2bbd0869a649b744e9d84977fc
-F test/quick.test bbaa1fbdac766cab2219d5599e9cd5bc2614d01e
+F test/quick.test 70695607082b3e1ca54023b2c856991604b07703
 F test/quote.test 215897dbe8de1a6f701265836d6601cc6ed103e6
 F test/rdonly.test bd054831f8a3078e765a0657e247182486f0cb47
 F test/reindex.test 44edd3966b474468b823d481eafef0c305022254
-F test/rollback.test 71ef4ea8cce5434045b1d1132aed36dabe177703
+F test/rollback.test d67022e8f99fdb1f115de7e8ea65139263b4bd40
 F test/rowid.test 1c8fc43c60d273e6ea44dfb992db587f3164312c
 F test/rtree.test b85fd4f0861a40ca366ac195e363be2528dcfadf
 F test/safety.test b69e2b2dd5d52a3f78e216967086884bbc1a09c6
@@ -648,7 +648,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P b055bfc4e5268d8a66d6a4f5e8aec1285fe4b8e7
-R a7f9557fc9b70a138a1706f314cf9726
-U danielk1977
-Z 55e2fccdb1a78cce9b6aee3d77c5f37e
+P 73efca985a05930df761b42886a3ba1c5199f32a
+R a137108881ea503d595235c9c0998c29
+U drh
+Z 0311988efaee1ccf84df6a1be703b5f6

diff --git a/manifest.uuid b/manifest.uuid
index 8eb3704337ff9a288dd414a514a051fc4429ff90..445d9567f95c3c152e50777ba6ed79c3d8917e26 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-73efca985a05930df761b42886a3ba1c5199f32a
\ No newline at end of file
+df2c28dc7310510bada292a2e8c1be073803858c
\ No newline at end of file

diff --git a/test/all.test b/test/all.test
index dedcddf004560441a4102c7daf00eebcceeb370a..c419c2c9060a1babfb223ca81f422ce2c3635705 100644 (file)
--- a/test/all.test
+++ b/test/all.test
@@ -10,13 +10,14 @@
 #***********************************************************************
 # This file runs all tests.
 #
-# $Id: all.test,v 1.58 2008/09/09 18:28:07 danielk1977 Exp $
+# $Id: all.test,v 1.59 2008/10/13 14:16:11 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 rename finish_test really_finish_test
 proc finish_test {} {
-  # no-op
+  catch {db close}
+  show_memstats
 }
 
 if {[file exists ./sqlite_test_count]} {

diff --git a/test/quick.test b/test/quick.test
index d5ef24551fb1eebd11b2ba4a7ba42ba638e15b46..77729c50f4271f2fa355141877bc5eb8f0332b13 100644 (file)
--- a/test/quick.test
+++ b/test/quick.test
@@ -6,7 +6,7 @@
 #***********************************************************************
 # This file runs all tests.
 #
-# $Id: quick.test,v 1.87 2008/09/09 18:28:07 danielk1977 Exp $
+# $Id: quick.test,v 1.88 2008/10/13 14:16:11 drh Exp $
 
 proc lshift {lvar} {
   upvar $lvar l
@@ -35,7 +35,10 @@ while {[set arg [lshift argv]] != ""} {
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 rename finish_test really_finish_test
-proc finish_test {} {}
+proc finish_test {} {
+  catch {db close}
+  show_memstats
+}
 set ISQUICK 1
 
 set EXCLUDE {

diff --git a/test/rollback.test b/test/rollback.test
index 5557b0f0c87d9272113fba09d5bfc33fab7bb45b..54fdcb20260f7574346099e60bdccc6dc6adb501 100644 (file)
--- a/test/rollback.test
+++ b/test/rollback.test
@@ -13,7 +13,7 @@
 # caused by an ON CONFLICT ROLLBACK clause aborts any other pending
 # statements.
 #
-# $Id: rollback.test,v 1.8 2008/10/07 15:00:09 danielk1977 Exp $
+# $Id: rollback.test,v 1.9 2008/10/13 14:16:11 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -125,9 +125,11 @@ if {$tcl_platform(platform) == "unix" && $permutation ne "onefile"} {
       SELECT distinct tbl_name FROM sqlite_master;
     } db2
   } {t1 t3}
-  do_test rollback-2.3 {
-    file exists testA.db-journal
-  } 0
+  if {[lsearch {exclusive persistent_journal no_journal} $permutation]<0} {
+    do_test rollback-2.3 {
+      file exists testA.db-journal
+    } 0
+  }
   do_test rollback-2.4 {
     execsql {
       SELECT distinct tbl_name FROM sqlite_master;