From: dan Date: Sat, 4 Feb 2023 21:25:17 +0000 (+0000) Subject: Avoid running rbu tests under permutation "journaltest", which does not support wal... X-Git-Tag: version-3.41.0~56 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a3d4d7a0ae71e41e58106b92e8a45e7f86b04373;p=thirdparty%2Fsqlite.git Avoid running rbu tests under permutation "journaltest", which does not support wal. Fix some other test script problems. FossilOrigin-Name: 92f018698a87ed32acc31d83f7246dbb7295867bd6a801b7984a16f97a5c7786 --- diff --git a/ext/rbu/rbu1.test b/ext/rbu/rbu1.test index 2c3860e808..418857d8b1 100644 --- a/ext/rbu/rbu1.test +++ b/ext/rbu/rbu1.test @@ -11,12 +11,10 @@ # source [file join [file dirname [info script]] rbu_common.tcl] -ifcapable !rbu { finish_test ; return } +if_no_rbu_support { finish_test ; return } set ::testprefix rbu1 db close -sqlite3_shutdown -sqlite3_config_uri 1 # Create a simple RBU database. That expects to write to a table: # diff --git a/ext/rbu/rbu10.test b/ext/rbu/rbu10.test index 7f75dbfa76..8705c7b2e5 100644 --- a/ext/rbu/rbu10.test +++ b/ext/rbu/rbu10.test @@ -11,7 +11,7 @@ # source [file join [file dirname [info script]] rbu_common.tcl] -ifcapable !rbu { finish_test ; return } +if_no_rbu_support { finish_test ; return } set ::testprefix rbu10 #-------------------------------------------------------------------- diff --git a/ext/rbu/rbu11.test b/ext/rbu/rbu11.test index 4b711721ef..a42163cce6 100644 --- a/ext/rbu/rbu11.test +++ b/ext/rbu/rbu11.test @@ -11,7 +11,7 @@ # source [file join [file dirname [info script]] rbu_common.tcl] -ifcapable !rbu { finish_test ; return } +if_no_rbu_support { finish_test ; return } set ::testprefix rbu11 diff --git a/ext/rbu/rbu12.test b/ext/rbu/rbu12.test index 6e27ba692e..a753ef2494 100644 --- a/ext/rbu/rbu12.test +++ b/ext/rbu/rbu12.test @@ -11,7 +11,7 @@ # source [file join [file dirname [info script]] rbu_common.tcl] -ifcapable !rbu { finish_test ; return } +if_no_rbu_support { finish_test ; return } source $testdir/lock_common.tcl set ::testprefix rbu12 diff --git a/ext/rbu/rbu13.test b/ext/rbu/rbu13.test index 45b84f2b1d..9bf2adc6fa 100644 --- a/ext/rbu/rbu13.test +++ b/ext/rbu/rbu13.test @@ -14,7 +14,7 @@ # source [file join [file dirname [info script]] rbu_common.tcl] -ifcapable !rbu { finish_test ; return } +if_no_rbu_support { finish_test ; return } source $testdir/lock_common.tcl set ::testprefix rbu13 diff --git a/ext/rbu/rbu14.test b/ext/rbu/rbu14.test index 18114ec7a9..ac5b92c6c7 100644 --- a/ext/rbu/rbu14.test +++ b/ext/rbu/rbu14.test @@ -14,7 +14,7 @@ # source [file join [file dirname [info script]] rbu_common.tcl] -ifcapable !rbu { finish_test ; return } +if_no_rbu_support { finish_test ; return } source $testdir/lock_common.tcl set ::testprefix rbu14 diff --git a/ext/rbu/rbu3.test b/ext/rbu/rbu3.test index fe2afdc059..4ea6adbcda 100644 --- a/ext/rbu/rbu3.test +++ b/ext/rbu/rbu3.test @@ -11,7 +11,7 @@ # source [file join [file dirname [info script]] rbu_common.tcl] -ifcapable !rbu { finish_test ; return } +if_no_rbu_support { finish_test ; return } set ::testprefix rbu3 @@ -24,9 +24,6 @@ proc run_rbu {target rbu} { } forcedelete test.db-oal rbu.db -db close -sqlite3_shutdown -sqlite3_config_uri 1 reset_db #-------------------------------------------------------------------- diff --git a/ext/rbu/rbu5.test b/ext/rbu/rbu5.test index 02ecf6be16..2ae69e9652 100644 --- a/ext/rbu/rbu5.test +++ b/ext/rbu/rbu5.test @@ -13,7 +13,7 @@ # source [file join [file dirname [info script]] rbu_common.tcl] -ifcapable !rbu { finish_test ; return } +if_no_rbu_support { finish_test ; return } set ::testprefix rbu5 diff --git a/ext/rbu/rbu6.test b/ext/rbu/rbu6.test index cddd938703..29d4c5e1a2 100644 --- a/ext/rbu/rbu6.test +++ b/ext/rbu/rbu6.test @@ -14,7 +14,7 @@ # is being applied. source [file join [file dirname [info script]] rbu_common.tcl] -ifcapable !rbu { finish_test ; return } +if_no_rbu_support { finish_test ; return } set ::testprefix rbu6 proc setup_test {} { diff --git a/ext/rbu/rbu7.test b/ext/rbu/rbu7.test index e8ec0343db..ffe6ebe1b6 100644 --- a/ext/rbu/rbu7.test +++ b/ext/rbu/rbu7.test @@ -14,7 +14,7 @@ source [file join [file dirname [info script]] rbu_common.tcl] -ifcapable !rbu { finish_test ; return } +if_no_rbu_support { finish_test ; return } set ::testprefix rbu7 # Test index: diff --git a/ext/rbu/rbu8.test b/ext/rbu/rbu8.test index 86e931482e..b73bde274c 100644 --- a/ext/rbu/rbu8.test +++ b/ext/rbu/rbu8.test @@ -13,7 +13,7 @@ # source [file join [file dirname [info script]] rbu_common.tcl] -ifcapable !rbu { finish_test ; return } +if_no_rbu_support { finish_test ; return } set ::testprefix rbu8 do_execsql_test 1.0 { diff --git a/ext/rbu/rbu9.test b/ext/rbu/rbu9.test index fe808b3ac6..499ff09459 100644 --- a/ext/rbu/rbu9.test +++ b/ext/rbu/rbu9.test @@ -13,7 +13,7 @@ # source [file join [file dirname [info script]] rbu_common.tcl] -ifcapable !rbu { finish_test ; return } +if_no_rbu_support { finish_test ; return } set ::testprefix rbu9 ifcapable !fts3 { diff --git a/ext/rbu/rbuA.test b/ext/rbu/rbuA.test index cdc0c8040b..b43d30d4f6 100644 --- a/ext/rbu/rbuA.test +++ b/ext/rbu/rbuA.test @@ -15,7 +15,7 @@ # source [file join [file dirname [info script]] rbu_common.tcl] -ifcapable !rbu { finish_test ; return } +if_no_rbu_support { finish_test ; return } set ::testprefix rbuA set db_sql { diff --git a/ext/rbu/rbuB.test b/ext/rbu/rbuB.test index fca755a4b6..3e777631d5 100644 --- a/ext/rbu/rbuB.test +++ b/ext/rbu/rbuB.test @@ -12,7 +12,7 @@ # source [file join [file dirname [info script]] rbu_common.tcl] -ifcapable !rbu { finish_test ; return } +if_no_rbu_support { finish_test ; return } set ::testprefix rbuB db close diff --git a/ext/rbu/rbuC.test b/ext/rbu/rbuC.test index 430b14418e..a38a6918a9 100644 --- a/ext/rbu/rbuC.test +++ b/ext/rbu/rbuC.test @@ -13,7 +13,7 @@ # source [file join [file dirname [info script]] rbu_common.tcl] -ifcapable !rbu { finish_test ; return } +if_no_rbu_support { finish_test ; return } set ::testprefix rbuC #------------------------------------------------------------------------- diff --git a/ext/rbu/rbu_common.tcl b/ext/rbu/rbu_common.tcl index c4e98784a4..cb4f63820b 100644 --- a/ext/rbu/rbu_common.tcl +++ b/ext/rbu/rbu_common.tcl @@ -15,6 +15,15 @@ if {![info exists testdir]} { } source $testdir/tester.tcl +proc if_no_rbu_support {tcl} { + set bOk 1 + ifcapable !rbu { set bOk 0 } + if {[permutation]=="journaltest"} { set bOk 0 } + if {$bOk==0} { + uplevel $tcl + } +} + proc check_prestep_state {target state} { set oal_exists [file exists $target-oal] set wal_exists [file exists $target-wal] diff --git a/ext/rbu/rbubusy.test b/ext/rbu/rbubusy.test index 088711405a..b4b43219be 100644 --- a/ext/rbu/rbubusy.test +++ b/ext/rbu/rbubusy.test @@ -13,6 +13,7 @@ source [file join [file dirname [info script]] rbu_common.tcl] ifcapable !rbu { finish_test ; return } +if_no_rbu_support { finish_test ; return } set ::testprefix rbubusy db close diff --git a/ext/rbu/rbucollate.test b/ext/rbu/rbucollate.test index 52f6ba373f..beb54aa54e 100644 --- a/ext/rbu/rbucollate.test +++ b/ext/rbu/rbucollate.test @@ -11,7 +11,7 @@ # source [file join [file dirname [info script]] rbu_common.tcl] -ifcapable !rbu { finish_test ; return } +if_no_rbu_support { finish_test ; return } set ::testprefix rbucollate ifcapable !icu_collations { @@ -19,11 +19,6 @@ ifcapable !icu_collations { return } -db close -sqlite3_shutdown -sqlite3_config_uri 1 -reset_db - # Create a simple RBU database. That expects to write to a table: # # CREATE TABLE t1(a PRIMARY KEY, b, c); diff --git a/ext/rbu/rbucrash.test b/ext/rbu/rbucrash.test index c2132bc3d3..e187e8db38 100644 --- a/ext/rbu/rbucrash.test +++ b/ext/rbu/rbucrash.test @@ -11,15 +11,9 @@ # source [file join [file dirname [info script]] rbu_common.tcl] -ifcapable !rbu { finish_test ; return } +if_no_rbu_support { finish_test ; return } set ::testprefix rbucrash -db close -forcedelete test.db-oal rbu.db -sqlite3_shutdown -sqlite3_config_uri 1 -reset_db - # Set up a target database and an rbu update database. The target # db is the usual "test.db", the rbu db is "test.db2". # diff --git a/ext/rbu/rbucrash2.test b/ext/rbu/rbucrash2.test index 683de88492..10721df709 100644 --- a/ext/rbu/rbucrash2.test +++ b/ext/rbu/rbucrash2.test @@ -11,15 +11,9 @@ # source [file join [file dirname [info script]] rbu_common.tcl] -ifcapable !rbu { finish_test ; return } +if_no_rbu_support { finish_test ; return } set ::testprefix rbucrash2 -db close -forcedelete test.db-oal rbu.db -sqlite3_shutdown -sqlite3_config_uri 1 -reset_db - # Set up a target database and an rbu update database. The target # db is the usual "test.db", the rbu db is "test.db2". # diff --git a/ext/rbu/rbudiff.test b/ext/rbu/rbudiff.test index b165cf2be7..e5e3df12f2 100644 --- a/ext/rbu/rbudiff.test +++ b/ext/rbu/rbudiff.test @@ -14,7 +14,7 @@ # source [file join [file dirname [info script]] rbu_common.tcl] -ifcapable !rbu { finish_test ; return } +if_no_rbu_support { finish_test ; return } set testprefix rbudiff set PROG [test_find_sqldiff] diff --git a/ext/rbu/rbudor.test b/ext/rbu/rbudor.test index 684b43a946..c456d6ab71 100644 --- a/ext/rbu/rbudor.test +++ b/ext/rbu/rbudor.test @@ -14,7 +14,7 @@ # source [file join [file dirname [info script]] rbu_common.tcl] -ifcapable !rbu { finish_test ; return } +if_no_rbu_support { finish_test ; return } set ::testprefix rbudor set bigA [string repeat a 5000] diff --git a/ext/rbu/rbuexlock.test b/ext/rbu/rbuexlock.test index 570489cbc7..27fd6c4ba2 100644 --- a/ext/rbu/rbuexlock.test +++ b/ext/rbu/rbuexlock.test @@ -11,12 +11,15 @@ # source [file join [file dirname [info script]] rbu_common.tcl] -ifcapable !rbu { finish_test ; return } +if_no_rbu_support { finish_test ; return } set ::testprefix rbuexlock db close -sqlite3_shutdown -sqlite3_config_uri 1 + +set journalmode delete +if {[permutation]=="inmemory_journal"} { + set journalmode memory +} # Create a simple RBU database. That expects to write to a table: # @@ -65,7 +68,7 @@ do_test 1.2.0 { do_catchsql_test 1.2.1 { SELECT * FROM t1 } {0 {1 2 3}} do_test 1.2.2 { db eval {PRAGMA journal_mode} -} {delete} +} $journalmode do_test 1.3.0 { while {[file exists test.db-wal]==0} { @@ -75,7 +78,7 @@ do_test 1.3.0 { do_catchsql_test 1.3.1 { SELECT * FROM t1 } {1 {database is locked}} do_test 1.3.2 { db eval {PRAGMA journal_mode} -} {delete} +} $journalmode do_test 1.4.0 { @@ -84,7 +87,7 @@ do_test 1.4.0 { do_catchsql_test 1.4.1 { SELECT * FROM t1 } {1 {database is locked}} do_test 1.4.2 { db eval {PRAGMA journal_mode} -} {delete} +} $journalmode rbu close @@ -99,7 +102,7 @@ do_test 1.5.1 { do_catchsql_test 1.5.2 { SELECT * FROM t1 } {1 {database is locked}} do_test 1.5.2 { db eval {PRAGMA journal_mode} -} {delete} +} $journalmode do_test 1.6.0 { @@ -108,7 +111,7 @@ do_test 1.6.0 { do_catchsql_test 1.6.1 { SELECT * FROM t1 } {1 {database is locked}} do_test 1.6.2 { db eval {PRAGMA journal_mode} -} {delete} +} $journalmode do_test 1.7.0 { while {[rbu step]=="SQLITE_OK"} {} @@ -117,7 +120,7 @@ do_test 1.7.0 { do_catchsql_test 1.7.2 { SELECT count(*) FROM t1 } {0 9} do_test 1.7.2 { db eval {PRAGMA journal_mode} -} {delete} +} $journalmode reset_db do_execsql_test 2.0 { diff --git a/ext/rbu/rbuexpr.test b/ext/rbu/rbuexpr.test index 724a0f131f..4635d9fef2 100644 --- a/ext/rbu/rbuexpr.test +++ b/ext/rbu/rbuexpr.test @@ -11,15 +11,9 @@ # source [file join [file dirname [info script]] rbu_common.tcl] -ifcapable !rbu { finish_test ; return } +if_no_rbu_support { finish_test ; return } set ::testprefix rbuexpr -db close -sqlite3_shutdown -sqlite3_config_uri 1 - -sqlite3 db test.db - do_execsql_test 1.0 { CREATE TABLE t1(a, b, c PRIMARY KEY); CREATE INDEX i1 ON t1(a, null, b+1); diff --git a/ext/rbu/rbufault.test b/ext/rbu/rbufault.test index fb3efb972e..d35c389d7b 100644 --- a/ext/rbu/rbufault.test +++ b/ext/rbu/rbufault.test @@ -11,7 +11,7 @@ # source [file join [file dirname [info script]] rbu_common.tcl] -ifcapable !rbu { finish_test ; return } +if_no_rbu_support { finish_test ; return } source $testdir/malloc_common.tcl set ::testprefix rbufault diff --git a/ext/rbu/rbufault2.test b/ext/rbu/rbufault2.test index 4bf53a17fe..fafe0ede7d 100644 --- a/ext/rbu/rbufault2.test +++ b/ext/rbu/rbufault2.test @@ -11,7 +11,7 @@ # source [file join [file dirname [info script]] rbu_common.tcl] -ifcapable !rbu { finish_test ; return } +if_no_rbu_support { finish_test ; return } source $testdir/malloc_common.tcl set ::testprefix rbufault2 diff --git a/ext/rbu/rbufault3.test b/ext/rbu/rbufault3.test index b7ba54f6a6..543e237626 100644 --- a/ext/rbu/rbufault3.test +++ b/ext/rbu/rbufault3.test @@ -13,7 +13,7 @@ # source [file join [file dirname [info script]] rbu_common.tcl] -ifcapable !rbu { finish_test ; return } +if_no_rbu_support { finish_test ; return } source $testdir/malloc_common.tcl set ::testprefix rbufault3 diff --git a/ext/rbu/rbufault4.test b/ext/rbu/rbufault4.test index f4207c162e..d8a884101d 100644 --- a/ext/rbu/rbufault4.test +++ b/ext/rbu/rbufault4.test @@ -11,7 +11,7 @@ # source [file join [file dirname [info script]] rbu_common.tcl] -ifcapable !rbu { finish_test ; return } +if_no_rbu_support { finish_test ; return } source $testdir/malloc_common.tcl set ::testprefix rbufault4 diff --git a/ext/rbu/rbufts.test b/ext/rbu/rbufts.test index 8424c95708..b46c32fdc2 100644 --- a/ext/rbu/rbufts.test +++ b/ext/rbu/rbufts.test @@ -14,7 +14,7 @@ # source [file join [file dirname [info script]] rbu_common.tcl] -ifcapable !rbu { finish_test ; return } +if_no_rbu_support { finish_test ; return } set ::testprefix rbufts ifcapable !fts3 { diff --git a/ext/rbu/rbumisc.test b/ext/rbu/rbumisc.test index 6b89150bce..16293141be 100644 --- a/ext/rbu/rbumisc.test +++ b/ext/rbu/rbumisc.test @@ -11,14 +11,9 @@ # source [file join [file dirname [info script]] rbu_common.tcl] -ifcapable !rbu { finish_test ; return } +if_no_rbu_support { finish_test ; return } set ::testprefix rbumisc -db close -sqlite3_shutdown -sqlite3_config_uri 1 -reset_db - proc populate_rbu_db {} { forcedelete rbu.db sqlite3 rbu rbu.db diff --git a/ext/rbu/rbumulti.test b/ext/rbu/rbumulti.test index 95c4fee703..c24da3518d 100644 --- a/ext/rbu/rbumulti.test +++ b/ext/rbu/rbumulti.test @@ -16,12 +16,10 @@ # source [file join [file dirname [info script]] rbu_common.tcl] -ifcapable !rbu { finish_test ; return } +if_no_rbu_support { finish_test ; return } set ::testprefix rbumulti db close -sqlite3_shutdown -sqlite3_config_uri 1 autoinstall_test_functions diff --git a/ext/rbu/rbupartial.test b/ext/rbu/rbupartial.test index c8c476a1f9..0c8191d2b6 100644 --- a/ext/rbu/rbupartial.test +++ b/ext/rbu/rbupartial.test @@ -11,12 +11,10 @@ # source [file join [file dirname [info script]] rbu_common.tcl] -ifcapable !rbu { finish_test ; return } +if_no_rbu_support { finish_test ; return } set ::testprefix rbupartial db close -sqlite3_shutdown -sqlite3_config_uri 1 foreach {tn without_rowid a b c d} { 1 "" a b c d diff --git a/ext/rbu/rbupass.test b/ext/rbu/rbupass.test index 8bebe074bd..8b921cba4a 100644 --- a/ext/rbu/rbupass.test +++ b/ext/rbu/rbupass.test @@ -11,7 +11,7 @@ # source [file join [file dirname [info script]] rbu_common.tcl] -ifcapable !rbu { finish_test ; return } +if_no_rbu_support { finish_test ; return } set ::testprefix rbupass if {[info commands register_demovfs]==""} { @@ -20,22 +20,22 @@ if {[info commands register_demovfs]==""} { } db close -sqlite3_shutdown -sqlite3_config_uri 1 register_demovfs sqlite3rbu_create_vfs myvfs demo -sqlite3 db file:test.db?vfs=myvfs +sqlite3 db file:test.db?vfs=myvfs -uri 1 do_execsql_test 1.0 { CREATE TABLE t1(a INTEGER PRIMARY KEY, b); INSERT INTO t1 VALUES(1, 2); SELECT * FROM t1; } {1 2} -do_execsql_test 1.1 { - PRAGMA journal_mode = wal; -} {delete} +if {[permutation]!="inmemory_journal"} { + do_execsql_test 1.1 { + PRAGMA journal_mode = wal; + } {delete} +} do_execsql_test 1.2 { SELECT * FROM t1; diff --git a/ext/rbu/rbuprogress.test b/ext/rbu/rbuprogress.test index 513ccdbbe4..0726837424 100644 --- a/ext/rbu/rbuprogress.test +++ b/ext/rbu/rbuprogress.test @@ -11,7 +11,7 @@ # source [file join [file dirname [info script]] rbu_common.tcl] -ifcapable !rbu { finish_test ; return } +if_no_rbu_support { finish_test ; return } set ::testprefix rbuprogress diff --git a/ext/rbu/rburename.test b/ext/rbu/rburename.test index fb9d83ea19..e2bacaea50 100644 --- a/ext/rbu/rburename.test +++ b/ext/rbu/rburename.test @@ -12,7 +12,7 @@ # source [file join [file dirname [info script]] rbu_common.tcl] -ifcapable !rbu { finish_test ; return } +if_no_rbu_support { finish_test ; return } set ::testprefix rburename diff --git a/ext/rbu/rburesume.test b/ext/rbu/rburesume.test index fdbd214213..a9c7ee866a 100644 --- a/ext/rbu/rburesume.test +++ b/ext/rbu/rburesume.test @@ -16,7 +16,7 @@ # source [file join [file dirname [info script]] rbu_common.tcl] -ifcapable !rbu { finish_test ; return } +if_no_rbu_support { finish_test ; return } set ::testprefix rburesume forcedelete test.db-shm test.db-oal diff --git a/ext/rbu/rbusave.test b/ext/rbu/rbusave.test index 79b49de513..8e9708980b 100644 --- a/ext/rbu/rbusave.test +++ b/ext/rbu/rbusave.test @@ -11,7 +11,7 @@ # source [file join [file dirname [info script]] rbu_common.tcl] -ifcapable !rbu { finish_test ; return } +if_no_rbu_support { finish_test ; return } set ::testprefix rbusave do_execsql_test 1.0 { diff --git a/ext/rbu/rbusplit.test b/ext/rbu/rbusplit.test index b28f0c0da9..fb1d7238d4 100644 --- a/ext/rbu/rbusplit.test +++ b/ext/rbu/rbusplit.test @@ -12,12 +12,10 @@ # source [file join [file dirname [info script]] rbu_common.tcl] -ifcapable !rbu { finish_test ; return } +if_no_rbu_support { finish_test ; return } set ::testprefix rbusplit db close -sqlite3_shutdown -sqlite3_config_uri 1 autoinstall_test_functions diff --git a/ext/rbu/rbutemplimit.test b/ext/rbu/rbutemplimit.test index 3ca9c64d81..88b5f4152d 100644 --- a/ext/rbu/rbutemplimit.test +++ b/ext/rbu/rbutemplimit.test @@ -12,12 +12,10 @@ # TESTRUNNER: slow source [file join [file dirname [info script]] rbu_common.tcl] -ifcapable !rbu { finish_test ; return } +if_no_rbu_support { finish_test ; return } set ::testprefix rbutemplimit db close -sqlite3_shutdown -sqlite3_config_uri 1 proc setup_databases {} { forcedelete test.db2 diff --git a/ext/rbu/rbuvacuum.test b/ext/rbu/rbuvacuum.test index 4ed71c2665..ad377a4beb 100644 --- a/ext/rbu/rbuvacuum.test +++ b/ext/rbu/rbuvacuum.test @@ -15,7 +15,7 @@ # source [file join [file dirname [info script]] rbu_common.tcl] -ifcapable !rbu { finish_test ; return } +if_no_rbu_support { finish_test ; return } set ::testprefix rbuvacuum foreach step {0 1} { diff --git a/ext/rbu/rbuvacuum2.test b/ext/rbu/rbuvacuum2.test index eed8ea1ae4..34ec26188a 100644 --- a/ext/rbu/rbuvacuum2.test +++ b/ext/rbu/rbuvacuum2.test @@ -15,7 +15,7 @@ # source [file join [file dirname [info script]] rbu_common.tcl] -ifcapable !rbu { finish_test ; return } +if_no_rbu_support { finish_test ; return } foreach {step} {0 1} { foreach {ttt state} { diff --git a/ext/rbu/rbuvacuum3.test b/ext/rbu/rbuvacuum3.test index 98fb25fc04..d70c094f2f 100644 --- a/ext/rbu/rbuvacuum3.test +++ b/ext/rbu/rbuvacuum3.test @@ -15,7 +15,7 @@ # source [file join [file dirname [info script]] rbu_common.tcl] -ifcapable !rbu { finish_test ; return } +if_no_rbu_support { finish_test ; return } set testprefix rbuvacuum3 do_execsql_test 1.0 { diff --git a/ext/rbu/rbuvacuum4.test b/ext/rbu/rbuvacuum4.test index 269bd2152f..7b0db974d3 100644 --- a/ext/rbu/rbuvacuum4.test +++ b/ext/rbu/rbuvacuum4.test @@ -15,7 +15,7 @@ # source [file join [file dirname [info script]] rbu_common.tcl] -ifcapable !rbu { finish_test ; return } +if_no_rbu_support { finish_test ; return } set testprefix rbuvacuum4 set step 1 @@ -88,6 +88,7 @@ do_execsql_test 4.2 { SELECT count(*) fROM x1 } 6 +db cache flush do_rbu_vacuum_test 4.1.2 0 #------------------------------------------------------------------------- diff --git a/manifest b/manifest index 95769ed8d4..aab429fb6d 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Add\sALWAYS()\sand\sNEVER()\smacros\sto\sunreachable\sbranchs\sin\ssqlite_dbpage. -D 2023-02-04T20:53:31.889 +C Avoid\srunning\srbu\stests\sunder\spermutation\s"journaltest",\swhich\sdoes\snot\ssupport\swal.\sFix\ssome\sother\stest\sscript\sproblems. +D 2023-02-04T21:25:17.107 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -319,49 +319,49 @@ F ext/misc/wholenumber.c a838d1bea913c514ff316c69695efbb49ea3b8cb37d22afc57f73b6 F ext/misc/zipfile.c f98239261488397618ce4754c500626d1de20cd2d44bf2f2d571d7ddaab668a7 F ext/misc/zorder.c b0ff58fa643afa1d846786d51ea8d5c4b6b35aa0254ab5a82617db92f3adda64 F ext/rbu/rbu.c 801450b24eaf14440d8fd20385aacc751d5c9d6123398df41b1b5aa804bf4ce8 -F ext/rbu/rbu1.test c62d9bfdd988cd0a30fa84e6f9a733f540e1d16d3e0cde4ee744aeadbaef334a -F ext/rbu/rbu10.test 66b20eb97e9d923f3cd69a882c57eb6c945b19d7f1ceaa7712e1b02fae3793c2 -F ext/rbu/rbu11.test 34134e9331f2a6d29770cd4594e54ad92e007f0f6bca4ee12cddee113c61f60e -F ext/rbu/rbu12.test 3b18fa8b712274551c438acf4b71f6fbcebe71c09d0bc1058d3ec99c4e5c59bd -F ext/rbu/rbu13.test 67bae3f17fa6b74c8853b25804e7f5345926af42bc80a10b0c433ba9e54b87a6 -F ext/rbu/rbu14.test 3aa8202b181e25112fb80e7fe9e9f409d7d191d09f732bcb53fbd200d384bb63 -F ext/rbu/rbu3.test 76152c3601e6a0a39cebd37945bb79f7bd1061462053a3899432bd089c6ae15b -F ext/rbu/rbu5.test 29a4bd5261f1df259d598e8792607643861ba476c607343c68310bfd94919263 -F ext/rbu/rbu6.test 6966b6c734ee50279ecf59bc32c7b2bcfb972e91a3303e120bc31ca4ea28edd2 -F ext/rbu/rbu7.test 92938c6b0b0e7d268a75b5744fd4ea023f8f3da5d46c3764c625564d7001c7b8 -F ext/rbu/rbu8.test 2aba6914d3fc47565ac2a3de49fde4fe2f5181af449cd5443f0576ab0a92bc79 -F ext/rbu/rbu9.test f37042dee2caf1551d3ad462670189f05677c242510a5c0f8dd650750cb5426a -F ext/rbu/rbuA.test 94759f2117d5932bfff0b60405d5644665e2216254625be68998f055fd6b580a -F ext/rbu/rbuB.test 1e7641ec8c8eafc21fdaaa983ef04d999fa0a9b83d88175f561184a19dfdaa8c -F ext/rbu/rbuC.test 2e1cd0d85a7576b97c1919fa6d3697b6d40ed2acf626da99f8abf90a7b946f37 -F ext/rbu/rbu_common.tcl 60d904133ff843fe72cc0514e9dd2486707181e6e0fbab20979da28c48d21de9 -F ext/rbu/rbubusy.test 8ab40abb9b3210a453aa25971c64adbb1ff0f764eaf9c38e137482a63fd45b91 -F ext/rbu/rbucollate.test 559b5b877d61b2a7b7a7a49ad8cde5d21658c19d34fd2811f946ee5df6cb475b -F ext/rbu/rbucrash.test c6440ae5803676f357b579dea260c894f23081f6fc8befdbc9fd081990f52507 -F ext/rbu/rbucrash2.test d63c10195f2bbf7d7ec2248740dcc6171ecc2693080cfb65976c35f477120ac8 -F ext/rbu/rbudiff.test b0865fe535942d89795126087001be751fc0d2fa0ca667a59446cca027471eb9 -F ext/rbu/rbudor.test b77e10326ef3660e19d103bf1739ac52baf9e6a2486f631b8b369468adcaa37e -F ext/rbu/rbuexlock.test a6c135766e0cafa221ec69fa5c019beab2aad208750d3aa8c734d7260e01a4fe -F ext/rbu/rbuexpr.test 85effe05ee50594df27a903c48aa9b192bd26045a5be95d10f1a5495232dea15 -F ext/rbu/rbufault.test 9bc7538e4b02817d898b15ab590acb9648e2a6eb53dd1d3848c417f5980a107b -F ext/rbu/rbufault2.test 411469c638073bd6523f069bcaee07b413127f3f233de34756ebcf5a2a0ce566 -F ext/rbu/rbufault3.test d9042c8840eb92cca1f9552388f799f0ccca024ed5b8d9bb9c78f38d39a1f339 -F ext/rbu/rbufault4.test 778c73137822e12ddbf54da248c9b2be59b0580c4202c052fa07787ae493f04a -F ext/rbu/rbufts.test b4db0a6d89905d356cecb6f9f2fe7e4848da6b3b276b73b8689ce96301c2810c -F ext/rbu/rbumisc.test db67696663760aa4093f451ebeddc953a8d33ee9571a5651dff48d0597b7a812 -F ext/rbu/rbumulti.test e8891a63b078253d34e0cdee0ed7446808daa4138cfc7dbd0e359c50967e4351 -F ext/rbu/rbupartial.test bffeb40fe14906ab6f90286ae3913f8aa4b35a5b2de03f24ea2fcf80ee6f2b24 -F ext/rbu/rbupass.test c21e13b78ea62bf70850ee79ef96bfcbe203d7ccc2de83c35d452723328d20f0 -F ext/rbu/rbuprogress.test 3a0344032b7f62ae172cf1f4da52caa753bcf535bf73341ab23b3929a217d79b -F ext/rbu/rburename.test 6d9b4efbe537e221700db15903cd11b17cb0c97eaa6584baf01aac9664937462 -F ext/rbu/rburesume.test 9caa95842fd4a35c3e8aeb5ca83e638fa357f51a774d6a0487ada1122ab39612 -F ext/rbu/rbusave.test 323ad16da4492e173e99bd77397807d911e8b69df08318224bb748a5b955689f -F ext/rbu/rbusplit.test eb20a264b7681613db6cbf031c93b2f50addec89cd437ab737304eb143cd34a8 -F ext/rbu/rbutemplimit.test 6b4ac534ffdd0133c627ebb15b1abe449f941b088e985152133cdbdc1b489966 -F ext/rbu/rbuvacuum.test 36aa4024b226b13e47ab20f27aa5a239ba3eb1b0385c24d09507bd3f4c2a9ca4 -F ext/rbu/rbuvacuum2.test 851c5163261c2057adb5265f06240b37a52a18c2383fca17d0a3013f05261a6d -F ext/rbu/rbuvacuum3.test fbea74f2c316911c1983db06566d55fca4e270fdc731f62299417087362fb704 -F ext/rbu/rbuvacuum4.test 834e9d6c7cb46237493ec16489c0478ec4aedadf9396973f1fec93acb725ba25 +F ext/rbu/rbu1.test 25870dd7db7eb5597e2b4d6e29e7a7e095abf332660f67d89959552ce8f8f255 +F ext/rbu/rbu10.test 7c22caa32c2ff26983ca8320779a31495a6555737684af7aba3daaf762ef3363 +F ext/rbu/rbu11.test 8584f80ef4be00e6beec4154f638847ffc40b5f2832ffadfbaf558ae40e50cb5 +F ext/rbu/rbu12.test ec63aa7bfc3c65c1d774bf4357ed731723827d211d9d7cb0efa171bbaeeebaf4 +F ext/rbu/rbu13.test 658edbc3325d79252a98b761fde95460e439f80e820ff29e10261e25f870b3b6 +F ext/rbu/rbu14.test 05dac607a62f62102f4db92135979a8a4501143638060019aca08c753822cf39 +F ext/rbu/rbu3.test 4a81517af618c3bf8c72e2d0b81c7c06acb8d176036d63d8e6669b73342306ae +F ext/rbu/rbu5.test e21820b83822ae4c12afc2078a7b6c0523fb0cefe69c8b23c044cea91359e81c +F ext/rbu/rbu6.test db2ff1f832dfc9e34c7910b17e157c2fe0e36024a3fe1119dd6437640dc07c82 +F ext/rbu/rbu7.test 5fa41734613a3ae1bb93d280eb3c341cff5dcc72652ff9ec7fbaa12425eda9c2 +F ext/rbu/rbu8.test 93d45824dab8f68872b6d22acc787ab18ba92ef0fa0d430be37653d0246c7a0d +F ext/rbu/rbu9.test 4b66f0705442711a44b54ef2cc3c59952f1ea15f12e34442681bdb1a6eb33065 +F ext/rbu/rbuA.test 3f8fdd4ae7b9a0571af7361cd88359254f63e445ac4acfe395173e31d7e3fc31 +F ext/rbu/rbuB.test c639803bbc1dc9358afe6abe046dc4d3e9965238b75239b04e3a8e33e3e90f85 +F ext/rbu/rbuC.test 5326ea3954754c68fd518beb70d3e6b6690af53e1a5fa102d650e4110b26b4c5 +F ext/rbu/rbu_common.tcl 815cc97be0e67e96f3ccaff74d951eef89cefc34cec7d93d64f01d9402121545 +F ext/rbu/rbubusy.test 88298187ad35aac9084436d85ca66b3722f96eaa704a09cfe5f931d452ab7237 +F ext/rbu/rbucollate.test 9852ec5e5ba7f3b04ce849a24ef7298e03ae0f16e58e6031d0f845234559feec +F ext/rbu/rbucrash.test d2b5d619d9281c89cad74401b73b46172daa89906940b1d739c813ddc0cd2cf5 +F ext/rbu/rbucrash2.test 0a1a72223d880215ce2893a3260320c31a9358d23cb124c610e4f0d984a93285 +F ext/rbu/rbudiff.test 8b8b8b569c68fc880134e0fac4bf6b4b7a907aea4cc6eacf7e1d45e1d47b6aac +F ext/rbu/rbudor.test 293a192e668bb8e9c7c9704b080c1086ee17496f768e0f1823049e7d02651d1b +F ext/rbu/rbuexlock.test e3ece733cc8e0a6cb08533a41ed6f562438539ed309028c63375a5adee4a263b +F ext/rbu/rbuexpr.test 2c91617509c88b6e9030f7bf6ff720df26032fcd801adc25533feae726a57382 +F ext/rbu/rbufault.test c51de14067cfe867849530d3d1718ffeb28522f28d52937f95dd7bc2116eb42e +F ext/rbu/rbufault2.test 8cc8f6298d2d7d20080b2c77e65b607af8b89839f9d87c0972b27e6442edc258 +F ext/rbu/rbufault3.test d14ff46e050816ce43c4ed320a0927712636ac11bf48bfc5f74601f183af5445 +F ext/rbu/rbufault4.test fa2f9d10b213eaa3cfbf0711ba9255761febe372c9546fa22ef4006f53ed8acc +F ext/rbu/rbufts.test df754d2f96c22d1da8b5d685b4a4a49863971920856d17620cef724e3a9b6edd +F ext/rbu/rbumisc.test 6641749e42c83062824c86b3d03a47f8ec35760f341bc023f53e612655b0a8af +F ext/rbu/rbumulti.test 6f6cdd9b3775108aada5216762cbbd7b5d5caa7cb620b3e6e1b8ace81286a2e0 +F ext/rbu/rbupartial.test 4ed7789f47128c8aa7ff58445face8a070cef852993afe03c863913f3cea8729 +F ext/rbu/rbupass.test 2ee86581a441f3b4b449b99a2dc203d5d6a08750dd2ee9ab6a02743e238d3c8a +F ext/rbu/rbuprogress.test db8bb26a8123d35f52acfc3984b56caa31c8fcd1fa3589991b9c8e8a68e64b59 +F ext/rbu/rburename.test 8d8a6a6ba896338d0610658e1f60e8055a181d5913e1e21c41b866a8f15bb7cd +F ext/rbu/rburesume.test ed122426a0411fb16efca49f19a5f2ba18956a765d5d9031b9d01931cbe7f282 +F ext/rbu/rbusave.test 588b618dad9d65c4b13d03a79931de82213503fedc26bdf5789c996ecf427fba +F ext/rbu/rbusplit.test a6dedd23cf37bcf2e8646d9d7139846e96d60d92f9bc6d6ba6ca8c24c0bd1f72 +F ext/rbu/rbutemplimit.test 4980df2d4b74f4dd982add8f78809106154ef5a3c4bdce747422ab0b0481e029 +F ext/rbu/rbuvacuum.test 542561741ff2b262e3694bc6012b44694ee62c545845319a06f323783b15311e +F ext/rbu/rbuvacuum2.test ae097d04feb041446a74fac94b24bffeb3fdd60e32b848c5611e507ab702b81b +F ext/rbu/rbuvacuum3.test 3ce42695fdf21aaa3499e857d7d4253bc499ad759bcd6c9362042c13cd37d8de +F ext/rbu/rbuvacuum4.test ffccd22f67e2d0b380d2889685742159dfe0d19a3880ca3d2d1d69eefaebb205 F ext/rbu/sqlite3rbu.c 348bb6251e6ec459de102f8b2dd50789a98643ef7a28e56e4c787ac9659c15ea F ext/rbu/sqlite3rbu.h 9d923eb135c5d04aa6afd7c39ca47b0d1d0707c100e02f19fdde6a494e414304 F ext/rbu/test_rbu.c ee6ede75147bc081fe9bc3931e6b206277418d14d3fbceea6fdc6216d9b47055 @@ -921,7 +921,7 @@ F test/dbfuzz001.test 55e1a3504f8dea84155e09912fe3b1c3ad77e0b1a938ec42ca03b8e51b F test/dbfuzz2-seed1.db e6225c6f3d7b63f9c5b6867146a5f329d997ab105bee64644dc2b3a2f2aebaee F test/dbfuzz2.c 4b3c12de4d98b1b2d908ab03d217d4619e47c8b23d5e67f8a6f2b1bdee7cae23 F test/dbpage.test fce29035c7566fd7835ec0f19422cb4b9c6944ce0e1b936ff8452443f92e887d -F test/dbpagefault.test b893e9e43d55edc0cdf3f71ae093802f80f0fb517d839eefeae5647c49a41f36 +F test/dbpagefault.test d9111a62f3601d3efc6841ace3940181937342d245f92a1cca6cba8206d4f58a F test/dbstatus.test 4a4221a883025ffd39696b3d1b3910b928fb097d77e671351acb35f3aed42759 F test/dbstatus2.test f5fe0afed3fa45e57cfa70d1147606c20d2ba23feac78e9a172f2fe8ab5b78ef F test/decimal.test fcf403fd5585f47342234e153c4a4338cd737b8e0884ac66fc484df47dbcf1a7 @@ -1325,7 +1325,7 @@ F test/multiplex.test d74c034e52805f6de8cc5432cef8c9eb774bb64ec29b83a22effc8ca4d F test/multiplex2.test 580ca5817c7edbe4cc68fa150609c9473393003a F test/multiplex3.test fac575e0b1b852025575a6a8357701d80933e98b5d2fe6d35ddaa68f92f6a1f7 F test/multiplex4.test e8ae4c4bd70606a5727743241f13b5701990abe4 -F test/mutex1.test 177db2e4edb530f2ff21edc52ac79a412dbe63e4c47c3ae9504d3fb4f1ce81fa +F test/mutex1.test 4d7ecb155ae5ba9ca6f1817c1c74d51b5bb284d7f599de1859a9f2c9a1ca0d38 F test/mutex2.test bfeaeac2e73095b2ac32285d2756e3a65e681660 F test/nan.test 437d40e6d0778b050d7750726c0cbd2c9936b81962926e8f8c48ca698f00f4d1 F test/nockpt.test 8c43b25af63b0bd620cf1b003529e37b6f1dc53bd22690e96a1bd73f78dde53a @@ -1566,7 +1566,7 @@ F test/temptable2.test 76821347810ecc88203e6ef0dd6897b6036ac788e9dd3e6b04fd4d163 F test/temptable3.test d11a0974e52b347e45ee54ef1923c91ed91e4637 F test/temptrigger.test 38f0ca479b1822d3117069e014daabcaacefffcc F test/tester.tcl 8d54d40a55e12554b4509bc12078b201b233c8e842a7543629094a21b1ba956d -F test/testrunner.tcl d897f93dd316f3f01449632b5342534b8cf0e63e4131fa3f540086819a9055c1 +F test/testrunner.tcl ff766305cb067fcb28bfff38532652da4d941dc2216ee0929923a223133b3156 F test/testrunner_data.tcl 8169c68654ac8906833b8a6aadca973358a441ebf88270dd05c153e5f96f76b8 F test/thread001.test a0985c117eab62c0c65526e9fa5d1360dd1cac5b03bde223902763274ce21899 F test/thread002.test c24c83408e35ba5a952a3638b7ac03ccdf1ce4409289c54a050ac4c5f1de7502 @@ -2048,8 +2048,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P a4eb0b0d837291590958a5f292f41e80e0f722668a060aebfed5ea36ea176332 -R 209c8556f0975e3b9220a5e1d6dffc37 -U drh -Z bec012735e0de7ece623a38f502fd450 +P db875cd6be3b6e0032325cf42e6846eb41a7f099eb4561baf402d914446b052d +R f32e115307aa3bba0c86edbf0076cdff +U dan +Z 07df44deee3876ff47bd4367db1f216b # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index efb57c3409..e1f0dbbe67 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -db875cd6be3b6e0032325cf42e6846eb41a7f099eb4561baf402d914446b052d \ No newline at end of file +92f018698a87ed32acc31d83f7246dbb7295867bd6a801b7984a16f97a5c7786 \ No newline at end of file diff --git a/test/dbpagefault.test b/test/dbpagefault.test index b41ac66235..544d279ce9 100644 --- a/test/dbpagefault.test +++ b/test/dbpagefault.test @@ -46,11 +46,11 @@ do_faultsim_test 2 -prep { } -body { execsql { CREATE VIRTUAL TABLE t1 USING sqlite_dbpage(); - INSERT INTO t1 DEFAULT VALUES; + UPDATE t1 SET data=zeroblob(1024) WHERE pgno=1 AND schema='aux'; } } -test { execsql { PRAGMA journal_mode = off } - faultsim_test_result {1 {no such schema}} {1 {SQL logic error}} + faultsim_test_result {0 {}} {1 {no such schema}} {1 {SQL logic error}} {1 {unable to open a temporary database file for storing temporary tables}} } reset_db diff --git a/test/mutex1.test b/test/mutex1.test index aac04bf49e..0fc8368f76 100644 --- a/test/mutex1.test +++ b/test/mutex1.test @@ -118,6 +118,7 @@ ifcapable threadsafe1&&shared_cache { do_test mutex1.2.$mode.1 { catch {db close} sqlite3_shutdown + sqlite3_config_memstatus 1 sqlite3_config $mode } SQLITE_OK diff --git a/test/testrunner.tcl b/test/testrunner.tcl index 0522391b3d..7d45704032 100644 --- a/test/testrunner.tcl +++ b/test/testrunner.tcl @@ -461,8 +461,6 @@ proc testset_patternlist {patternlist} { } elseif {[info exists ::testspec($first)]} { set clist $first - set patternlist [lrange $patternlist 1 end] - testset_append testset "" $first [lrange $patternlist 1 end] } elseif { [llength $patternlist]==0 } { testset_append testset "" veryquick $patternlist