-C Refactor\ssome\sof\sthe\sglobal\svariables\sand\scommands\sused\sby\stester.tcl.
-D 2010-06-07T14:28:17
+C Change\sall.test,\squick.test\sand\spermutations.test\sso\sthat\sthey\suse\sa\sseparate\sinterpreter\sfor\seach\stest\sfile.
+D 2010-06-07T17:47:27
F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
F Makefile.in a5cad1f8f3e021356bfcc6c77dc16f6f1952bbc3
F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
F src/where.c 75fee9e255b62f773fcadd1d1f25b6f63ac7a356
F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
F test/alias.test 4529fbc152f190268a15f9384a5651bbbabc9d87
-F test/all.test 83bad6685ba4835aa39e0cc3db9f3b25760b62f7
+F test/all.test dbb6133bd1a9cf4d4f68ef929a3bf52bfcf6d267
F test/alter.test 15f9224868b290d6bf7a63f31437f31aee070636
F test/alter2.test 0266160d61b0f7156b7e7a9905dbf85ebe067c63
F test/alter3.test 25b95a136708f22b87184fa6a4309eea03d65153
F test/analyze.test ad5329098fe4de4a96852231d53e3e9e6283ad4b
F test/analyze2.test a2ad7b0a4e13801ee3968fe70f22aff52326569c
F test/analyze3.test 506203875258ffd8ffa879b9c3c5432022d2b6d8
-F test/async.test 8c75d31b8330f8b70cf2571b014d4476a063efdb
+F test/async.test 028bd42d4ff9c69b62953ea6f718e827f37e1d79
F test/async2.test bf5e2ca2c96763b4cba3d016249ad7259a5603b6
F test/async3.test 93edaa9122f498e56ea98c36c72abc407f4fb11e
F test/async4.test 166cc07057ff6f908fe42dcffaa8ca732c757acb
F test/autoindex1.test ffb06a246e2c1f89cfbe3d93eca513c9e78d4063
F test/autovacuum.test 25f891bc343a8bf5d9229e2e9ddab9f31a9ab5ec
F test/autovacuum_ioerr2.test 598b0663074d3673a9c1bc9a16e80971313bafe6
-F test/avtrans.test 030e1717a24d4ee977be6519191335f9546a5e3a
+F test/avtrans.test 0252654f4295ddda3b2cce0e894812259e655a85
F test/backup.test 5f7f66d067e695a6040be3295a5abc289f823838
F test/backup2.test 159419073d9769fdb1780ed7e5b391a046f898d5
F test/backup_ioerr.test 1f012e692f42c0442ae652443258f70e9f20fa38
F test/corrupt9.test 4aa1cb1ef091cb0e13e89a819c72911631b5176a
F test/corruptA.test 38b4f81c16099f6d8fa8b37e188fde76b8243994
F test/corruptB.test d88b500f7994cb2eb9646410c263111e9831f889
-F test/corruptC.test 691ed070baef5e1345939caadf270a52837a5064
+F test/corruptC.test e753c037cd4d92c760de760ddf6db7faea6a2fc2
F test/corruptD.test 3ae6e2dc6e2226c6935a8a40d4b5ee3eba75f8c0
F test/corruptE.test 34de490791060d749c933aef3970839df3f63ea9
F test/count.test 454e1ce985c94d13efeac405ce54439f49336163
F test/fts1n.test a2317dcd27b1d087ee3878b30e0a59c593c98b7a
F test/fts1o.test 382b8b07a2d6de5610814d9477117c4430464b9c
F test/fts1porter.test d86e9c3e0c7f8ff95add6582b4b585fb4e02b96d
-F test/fts2.test 4905d32e4b9e839fdf218e632a1fbdfb17b4c87e
+F test/fts2.test e3fb95f96a650411574efc136f3fb10eef479ed7
F test/fts2a.test 473a5c8b473a4e21a8e3fddaed1e59666e0c6ab7
F test/fts2b.test 964abc0236c849c07ca1ae496bb25c268ae94816
F test/fts2c.test ffb5a35230ac72c4354535c547965ce6824537c0
F test/fts2q.test b2fbbe038b7a31a52a6079b215e71226d8c6a682
F test/fts2r.test b154c30b63061d8725e320fba1a39e2201cadd5e
F test/fts2token.test d8070b241a15ff13592a9ae4a8b7c171af6f445a
-F test/fts3.test ba8e70f81a80b731423b7415232f16bebf3517de
+F test/fts3.test 471611ee89e815accf5514fe4a00bcec569e373d
F test/fts3_common.tcl 4d8eec9db565fed9098f45c378f28e1657802011
F test/fts3aa.test 5327d4c1d9b6c61021696746cc9a6cdc5bf159c0
F test/fts3ab.test 09aeaa162aee6513d9ff336b6932211008b9d1f9
F test/fts4aa.test eadf85621c0a113d4c7ad3ccbf8441130e007b8f
F test/func.test 6c5ce11e3a0021ca3c0649234e2d4454c89110ca
F test/func2.test 772d66227e4e6684b86053302e2d74a2500e1e0f
-F test/fuzz.test a4174c3009a3e2c2e14b31b364ebf7ddb49de2c9
+F test/fuzz.test 77fd50afc12847af50fcf1941679d90adebadde6
F test/fuzz2.test 207d0f9d06db3eaf47a6b7bfc835b8e2fc397167
F test/fuzz3.test aec64345184d1662bd30e6a17851ff659d596dc5
F test/fuzz_common.tcl a87dfbb88c2a6b08a38e9a070dabd129e617b45b
-F test/fuzz_malloc.test 4eca9d345f06d5b0b0105f7a2ef9e7f22658827b
+F test/fuzz_malloc.test dd7001ac86d09c154a7dff064f4739c60e2b312c
F test/hook.test f04c3412463f8ec117c1c704c74ca0f627ce733a
F test/icu.test 1fc0ff9a3bafc80abf679b11afc0f8a3ce995abd
F test/in.test d49419c6df515852f477fa513f3317181d46bc92
F test/join5.test 86675fc2919269aa923c84dd00ee4249b97990fe
F test/join6.test bf82cf3f979e9eade83ad0d056a66c5ed71d1901
F test/journal1.test 36f2d1bb9bf03f790f43fbdb439e44c0657fab19
-F test/jrnlmode.test a7407c0f193696f0ef303c663916c89e3bc4605d
+F test/jrnlmode.test 76f94d61528c5ff32102a12f8cf34f4cc36f7849
F test/jrnlmode2.test fe79ea1f0375c926b8de0362ddf94f34a64135fd
F test/jrnlmode3.test cfcdb12b90e640a23b92785a002d96c0624c8710
F test/keyword1.test a2400977a2e4fde43bf33754c2929fda34dbca05
F test/malloc8.test 9b7a3f8cb9cf0b12fff566e80a980b1767bd961d
F test/malloc9.test 2307c6ee3703b0a21391f3ea92388b4b73f9105e
F test/mallocA.test 4b650c745aab289079454f4d1c02abe5c97ab6b3
-F test/mallocAll.test b48fd15ce01f2dc7f088ea5cdffd01d84c1f5d63
+F test/mallocAll.test 98f1be74bc9f49a858bc4f361fc58e26486798be
F test/mallocB.test bc475ab850cda896142ab935bbfbc74c24e51ed6
F test/mallocC.test 3dffe16532f109293ce1ccecd0c31dca55ef08c4
F test/mallocD.test f78c295e8e18ea3029e65ca08278690e00c22100
F test/pagesize.test 76aa9f23ecb0741a4ed9d2e16c5fa82671f28efb
F test/pcache.test eebc4420b37cb07733ae9b6e99c9da7c40dd6d58
F test/pcache2.test 0d85f2ab6963aee28c671d4c71bec038c00a1d16
-F test/permutations.test a9307db3206f92f1f340239bc0f8a61e720eb666
+F test/permutations.test f22a00e318726c6d3f2640afcaf892b33ca4df60
F test/pragma.test 6960f9efbce476f70ba9ee2171daf5042f9e3d8a
F test/pragma2.test 5364893491b9231dd170e3459bfc2e2342658b47
F test/printf.test 05970cde31b1a9f54bd75af60597be75a5c54fea
F test/progress.test 5b075c3c790c7b2a61419bc199db87aaf48b8301
F test/ptrchng.test ef1aa72d6cf35a2bbd0869a649b744e9d84977fc
-F test/quick.test 9b7242a3af2ae8fa66d6ed0309fad6dea3398b81
+F test/quick.test f84a9aa4dbb1d208e8299430fae6dccb335cb41d
F test/quote.test 215897dbe8de1a6f701265836d6601cc6ed103e6
F test/randexpr1.tcl 40dec52119ed3a2b8b2a773bce24b63a3a746459
F test/randexpr1.test 1084050991e9ba22c1c10edd8d84673b501cc25a
F test/rdonly.test c243623b26c311faab2aee311a26af372e123a65
F test/reindex.test 44edd3966b474468b823d481eafef0c305022254
-F test/rollback.test 73355ad4492ff9a3a31e61c7e5eb5e01a1de94ca
+F test/rollback.test 1a83118ea6db4e7d8c10eaa63871b5e90502ffdc
F test/rowhash.test 0bc1d31415e4575d10cacf31e1a66b5cc0f8be81
F test/rowid.test e58e0acef38b527ed1b0b70d3ada588f804af287
-F test/rtree.test 046d72c3f4b0fad9f347602ca6206c3ba92f87fb
+F test/rtree.test fb372aff108d4371bd0b5e63e106947587ff4310
F test/savepoint.test 14f78c2c2538764850b38446957048113cc24f75
F test/savepoint2.test 9b8543940572a2f01a18298c3135ad0c9f4f67d7
F test/savepoint3.test e328085853b14898d78ceea00dfe7db18bb6a9ec
F test/savepoint4.test c8f8159ade6d2acd9128be61e1230f1c1edc6cc0
F test/savepoint5.test 0735db177e0ebbaedc39812c8d065075d563c4fd
-F test/savepoint6.test bdc653c5c08328c84a74471b5b23fd483b919dfe
+F test/savepoint6.test 76d3948568b2cdc0c13a671cadcae75009b183d6
F test/schema.test 8f7999be894260f151adf15c2c7540f1c6d6a481
F test/schema2.test 906408621ea881fdb496d878b1822572a34e32c5
F test/securedel.test 328d2921c0ca49bdd3352e516b0377fc07143254
F test/select6.test 2b5e8500d8ec3dd4c8e0c99eb1431b3d11fcc24c
F test/select7.test dad6f00f0d49728a879d6eb6451d4752db0b0abe
F test/select8.test 391de11bdd52339c30580dabbbbe97e3e9a3c79d
-F test/select9.test b4007b15396cb7ba2615cab31e1973b572e43210
+F test/select9.test 74c0fb2c6eecb0219cbed0cbe3df136f8fbf9343
F test/selectA.test 06d1032fa9009314c95394f2ca2e60d9f7ae8532
F test/selectB.test f305cc6660804cb239aab4e2f26b0e288b59958b
F test/selectC.test 33bb5673a8141df193c6fd56e6de7fea38b8d2ee
F test/sharedlock.test ffa0a3c4ac192145b310f1254f8afca4d553eabf
F test/shortread1.test bb591ef20f0fd9ed26d0d12e80eee6d7ac8897a3
F test/sidedelete.test f0ad71abe6233e3b153100f3b8d679b19a488329
-F test/soak.test cdac47cabac69406809d2be0ec3b62b5926aa040
+F test/soak.test 0b5b6375c9f4110c828070b826b3b4b0bb65cd5f
F test/softheap1.test c16709a16ad79fa43b32929b2e623d1d117ccf53
F test/sort.test 0e4456e729e5a92a625907c63dcdedfbe72c5dc5
F test/speed1.test f2974a91d79f58507ada01864c0e323093065452
F test/sync.test ded6b39d8d8ca3c0c5518516c6371b3316d3e3a3
F test/table.test 04ba066432430657712d167ebf28080fe878d305
F test/tableapi.test 7262a8cbaa9965d429f1cbd2747edc185fa56516
-F test/tclsqlite.test 013133fa83128569c6fb8a7a48dc7c4507e6ff1c
-F test/tempdb.test a1182f2b9a8bd7b208ba9797f9e9a2bcdd811ae8
+F test/tclsqlite.test 8c154101e704170c2be10f137a5499ac2c6da8d3
+F test/tempdb.test 800c36623d67a2ad1f58784b9c5644e0405af6e6
F test/temptable.test f42121a0d29a62f00f93274464164177ab1cc24a
F test/temptrigger.test b0273db072ce5f37cf19140ceb1f0d524bbe9f05
-F test/tester.tcl b4ff590be0f82fdc234c48d22eb0d20b0b88fb91
+F test/tester.tcl 46209e2b39647700162a3bfae7834f6f191dc08b
F test/thread001.test a3e6a7254d1cb057836cb3145b60c10bf5b7e60f
F test/thread002.test afd20095e6e845b405df4f2c920cb93301ca69db
F test/thread003.test b824d4f52b870ae39fc5bae4d8070eca73085dca
F test/tkt4018.test 7c2c9ba4df489c676a0a7a0e809a1fb9b2185bd1
F test/tokenize.test ce430a7aed48fc98301611429595883fdfcab5d7
F test/trace.test 4b36a41a3e9c7842151af6da5998f5080cdad9e5
-F test/trans.test f19bd2c8b5ccc89295454a42b35319b1381b9a3d
+F test/trans.test 56087099d76e7292b5e918fcad49c4d9a8b14f8e
F test/trans2.test d5337e61de45e66b1fcbf9db833fa8c82e624b22
F test/trans3.test d728abaa318ca364dc370e06576aa7e5fbed7e97
F test/trigger1.test 2e18561f85e448bb633c9c9de792e9bbf7b2dd3e
F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P cfe60254df50f086014b115f1a2d9e31c85d67fd
-R 50cc4d7d6b44eaeb1367abea35b6d06c
+P c2edf8e17f874d0ca4e94b75575bf6e14eea1f05
+R ce692aab008107eab9ae250eae0cd9f3
U dan
-Z 3a01b2eb025dd6709e50cc40bfab10b9
+Z d36c5afeb06c8bfd7f4cb398a6671d90
-c2edf8e17f874d0ca4e94b75575bf6e14eea1f05
\ No newline at end of file
+7c33eb5a5add8fe76dd412ecab5b6ff8cd78a98d
\ No newline at end of file
set testdir [file dirname $argv0]
source $testdir/tester.tcl
-rename finish_test really_finish_test
-proc finish_test {} {
- catch {db close}
- show_memstats
-}
if {[file exists ./sqlite_test_count]} {
set COUNT [exec cat ./sqlite_test_count]
set COUNT $value
}
-quick {
- set ISQUICK $value
+ set G(isquick) $value
}
-soak {
- set SOAKTEST $value
+ set G(issoak) $value
}
default {
puts stderr "Unknown option: $name"
}
set argv {}
-# LeakList will hold a list of the number of unfreed mallocs after
-# each round of the test. This number should be constant. If it
-# grows, it may mean there is a memory leak in the library.
-#
-set LeakList {}
-
set EXCLUDE {}
lappend EXCLUDE all.test ;# This file
lappend EXCLUDE async.test
lappend EXCLUDE crash2.test ;# Run separately later.
lappend EXCLUDE quick.test ;# Alternate test driver script
lappend EXCLUDE veryquick.test ;# Alternate test driver script
-lappend EXCLUDE malloc.test ;# Run separately later.
lappend EXCLUDE misuse.test ;# Run separately later.
lappend EXCLUDE memleak.test ;# Alternate test driver script
lappend EXCLUDE permutations.test ;# Run separately later.
if {[lsearch -exact $EXCLUDE $tail]>=0} continue
if {[llength $INCLUDE]>0 && [lsearch -exact $INCLUDE $tail]<0} continue
reset_prng_state
- source $testfile
- catch {db close}
- if {$sqlite_open_file_count>0} {
- puts "$tail did not close all files: $sqlite_open_file_count"
- fail_test $tail
- set sqlite_open_file_count 0
- }
- }
- if {[info exists Leak]} {
- lappend LeakList $Leak
+ slave_test_file $testfile
}
if {[set_test_counter errors]} break
source $testdir/permutations.test
set argv ""
-# Do one last test to look for a memory leak in the library. This will
-# only work if SQLite is compiled with the -DSQLITE_DEBUG=1 flag.
-#
-if {$LeakList!=""} {
- puts -nonewline memory-leak-test...
- incr_ntest
- foreach x $LeakList {
- if {$x!=[lindex $LeakList 0]} {
- puts " failed!"
- puts "Expected: all values to be the same"
- puts " Got: $LeakList"
- fail_test memory-leak-test
- break
- }
- }
- puts " Ok"
-}
-
# Run the crashtest only on unix and only once. If the library does not
# always create auto-vacuum databases, also run autovacuum_crash.test.
#
if {$::tcl_platform(platform)=="unix"} {
- source $testdir/crash.test
- source $testdir/crash2.test
+ slave_test_file [file join $testdir crash.test]
+ slave_test_file [file join $testdir crash2.test]
+
ifcapable !default_autovacuum {
set argv autovacuum_crash
source $testdir/permutations.test
}
}
-# Run the malloc tests and the misuse test after memory leak detection.
-# Both tests leak memory. Currently, misuse.test also leaks a handful of
-# file descriptors. This is not considered a problem, but can cause tests
-# in malloc.test to fail. So set the open-file count to zero before running
-# malloc.test to get around this.
+# Run the misuse test after memory leak detection. It may leak memory.
+# Currently, misuse.test also leaks a handful of file descriptors. This is
+# not considered a problem.
#
-catch {source $testdir/misuse.test}
-set sqlite_open_file_count 0
-catch {source $testdir/malloc.test}
+slave_test_file [file join $testdir misuse.test]
+finish_test
-catch {db close}
-set sqlite_open_file_count 0
-really_finish_test
catch {db2 close}
catch {db3 close}
}
-if {[info exists ISQUICK]} { set ASYNC_SAVE_ISQUICK $ISQUICK }
-set ISQUICK 1
+if {[info exists G(isquick)]} { set ASYNC_SAVE_ISQUICK $G(isquick) }
+set G(isquick) 1
set ASYNC_INCLUDE {
insert.test
rename finish_test {}
rename async_really_finish_test finish_test
-if {[info exists ASYNC_SAVE_ISQUICK]} { set ISQUICK $ASYNC_SAVE_ISQUICK }
+if {[info exists ASYNC_SAVE_ISQUICK]} { set G(isquick) $ASYNC_SAVE_ISQUICK }
finish_test
# t3 a little larger, and thus takes a little longer, so doing 40 tests
# is more than 2.0 times slower than doing 20 tests. Considerably more.
#
-if {[info exists ISQUICK]} {
+if {[info exists G(isquick)]} {
set limit 20
} else {
set limit 40
set fsize [file size test.db]
# Set a quasi-random random seed.
-if {[info exists SOAKTEST]} {
+if {[info exists ::G(issoak)]} {
# If we are doing SOAK tests, we want a different
# random seed for each run. Ideally we would like
# to use [clock clicks] or something like that here.
sqlite3_enable_shared_cache 1
}
-soak {
- set SOAKTEST 1
+ set G(issoak) 1
}
default {
set argv [linsert $argv 0 $arg]
}
rename finish_test really_finish_test
proc finish_test {} {}
-set ISQUICK 1
+set G(isquick) 1
set EXCLUDE {
fts2.test
sqlite3_enable_shared_cache 1
}
-soak {
- set SOAKTEST 1
+ set G(issoak) 1
}
default {
set argv [linsert $argv 0 $arg]
}
rename finish_test really_finish_test
proc finish_test {} {}
-set ISQUICK 1
+set G(isquick) 1
set EXCLUDE {
fts3.test
set ::REPEATS 5000
# If running quick.test, don't do so many iterations.
-if {[info exists ::ISQUICK]} {
- if {$::ISQUICK} { set ::REPEATS 20 }
+if {[info exists ::G(isquick)]} {
+ if {$::G(isquick)} { set ::REPEATS 20 }
}
source $testdir/fuzz_common.tcl
source $testdir/malloc_common.tcl
source $testdir/fuzz_common.tcl
-if {[info exists ISQUICK]} {
+if {[info exists G(isquick)]} {
set ::REPEATS 20
-} elseif {[info exists SOAKTEST]} {
+} elseif {[info exists G(issoak)]} {
set ::REPEATS 100
} else {
set ::REPEATS 40
ifcapable pragma {
# These tests are not run as part of the "journaltest" permutation,
# as the test_journal.c layer is incompatible with in-memory journaling.
- if {[catch {set ::permutations_test_prefix} z] || $z ne "journaltest"} {
+ if {[permutation] ne "journaltest"} {
do_test jrnlmode-6.1 {
execsql {
source $testdir/tester.tcl
rename finish_test really_finish_test
proc finish_test {} {}
-set ISQUICK 1
+set G(isquick) 1
set EXCLUDE {
mallocAll.test
set argv [lrange $argv 2 end]
#puts "PERM-DEBUG: testmode=$::perm::testmode tstfile=$::perm::testfile"
-set ::permutations_presql ""
-set ::permutations_test_prefix ""
-
if {$::perm::testmode eq "veryquick"} {
set ::perm::testmode [list persistent_journal no_journal]
- set ISQUICK 1
+ set G(isquick) 1
}
if {$::perm::testmode eq "quick"} {
set ::perm::testmode [list persistent_journal no_journal autovacuum_ioerr]
- set ISQUICK 1
+ set G(isquick) 1
}
if {$::perm::testmode eq "all" || $::perm::testmode eq ""} {
set ::perm::testmode {
if {[regexp {^wal} $filename]} {lappend WALTESTS $filename}
}
-rename finish_test really_finish_test2
-proc finish_test {} {}
-
-rename do_test really_do_test
-
-proc do_test {name args} {
- eval really_do_test [list "perm-$::permutations_test_prefix.$name"] $args
-}
-
-# Overload the [sqlite3] command
-rename sqlite3 really_sqlite3
-proc sqlite3 {args} {
- set r [eval really_sqlite3 $args]
- if { [llength $args] == 2 && $::permutations_presql ne "" } {
- [lindex $args 0] eval $::permutations_presql
- }
- set r
-}
-
-# run_tests OPTIONS
+# run_tests NAME OPTIONS
#
# where available options are:
#
+# -description TITLE (default "")
# -initialize SCRIPT (default "")
# -shutdown SCRIPT (default "")
# -include LIST-OF-FILES (default $::ALLTESTS)
# -exclude LIST-OF-FILES (default "")
# -presql SQL (default "")
-# -description TITLE (default "")
+# -options LIST (default "")
#
proc run_tests {name args} {
- set ::permutations_test_prefix $name
- set options(-shutdown) ""
- set options(-initialize) ""
- set options(-exclude) ""
- set options(-include) $::ALLTESTS
- set options(-presql) ""
- set options(-description) "no description supplied (fixme)"
+
+ set default(-shutdown) ""
+ set default(-initialize) ""
+ set default(-exclude) ""
+ set default(-include) $::ALLTESTS
+ set default(-presql) ""
+ set default(-description) "no description supplied (fixme)"
+ set default(-options) ""
+
+ array set options [array get default]
array set options $args
+ foreach k [array names options] {
+ if {[info exists default($k)]==0} {
+ error "Unknown option: $k"
+ }
+ }
#puts "PERM-DEBUG: name=$name testfile=$::perm::testfile"
#puts "PERM-DEBUG: [array get options]"
return
}
+
+ set ::G(perm:name) $name
+ set ::G(perm:presql) $options(-presql)
+ set ::G(perm:sqlite3_args) $options(-options)
+
uplevel $options(-initialize)
- set ::permutations_presql $options(-presql)
foreach file [lsort $options(-include)] {
if {[lsearch $options(-exclude) $file] < 0 &&
"$::perm::testfile.test" eq $file )
} {
set ::perm::shared_cache_setting [shared_cache_setting]
- uplevel source $::testdir/$file
+
+ slave_test_file $::testdir/$file
+
if {$::perm::shared_cache_setting ne [shared_cache_setting]} {
error "File $::testdir/$file changed the shared cache setting from $::perm::shared_cache_setting to [shared_cache_setting]"
}
}
}
+
uplevel $options(-shutdown)
- set ::permutations_test_prefix ""
+
+ unset ::G(perm:name)
+ unset ::G(perm:presql)
+ unset ::G(perm:sqlite3_args)
}
proc shared_cache_setting {} {
run_tests "journaltest" -description {
Check that pages are synced before being written (test_journal.c).
} -initialize {
- set ISQUICK 1
+ set G(isquick) 1
catch {db close}
register_jt_vfs -default ""
#sqlite3_instvfs binarylog -default binarylog ostrace.bin
if {[info commands register_demovfs] != ""} {
run_tests "demovfs" -description {
- Check that pages are synced before being written (test_journal.c).
+ Check that the demovfs (code in test_demovfs.c) more or less works.
} -initialize {
register_demovfs
} -shutdown {
run_tests "wal" -description {
Run tests with journal_mode=WAL
} -initialize {
- set ::savepoint6_iterations 100
+ set ::G(savepoint6_iterations) 100
} -shutdown {
- unset -nocomplain ::savepoint6_iterations
+ unset -nocomplain ::G(savepoint6_iterations)
} -include {
savepoint.test savepoint2.test savepoint6.test
trans.test avtrans.test
if {$::perm::testmode eq "targets"} { puts "" ; exit }
-# Restore the [sqlite3] command.
-#
-rename sqlite3 {}
-rename really_sqlite3 sqlite3
-
-# Restore the [finish_test] command.
-#
-rename finish_test ""
-rename really_finish_test2 finish_test
-
-# Restore the [do_test] command.
-#
-rename do_test ""
-rename really_do_test do_test
-
finish_test
#***********************************************************************
# This file runs all tests.
#
-# $Id: quick.test,v 1.95 2009/03/16 14:48:19 danielk1977 Exp $
+
+set testdir [file dirname $argv0]
+source $testdir/tester.tcl
+db close
proc lshift {lvar} {
upvar $lvar l
sqlite3_enable_shared_cache 1
}
-soak {
- set SOAKTEST 1
+ set G(issoak) 1
}
-start {
set STARTAT "[lshift argv]*"
}
}
-set testdir [file dirname $argv0]
-source $testdir/tester.tcl
-rename finish_test really_finish_test
-proc finish_test {} {
- catch {db close}
- show_memstats
-}
-set ISQUICK 1
+set G(isquick) 1
set EXCLUDE {
all.test
set QUICKTEST_INCLUDE {}
catch { set QUICKTEST_INCLUDE $env(QUICKTEST_INCLUDE) }
+# Run all test files in directory $testdir, subject to the following:
+#
+# 1. If a test file is specified as part of the $INCLUDE or
+# $QUICKTEST_INCLUDE list variables, run it.
+#
+# 2. If $INCLUDE is non-empty, and rule 1 does not apply to it, do not run it.
+#
+# 3. If a test file is specified as part of $EXCLUDE, and rule 1 does not
+# apply, do not run it.
+#
foreach testfile [lsort -dictionary [glob $testdir/*.test]] {
set tail [file tail $testfile]
- if { [lsearch $QUICKTEST_INCLUDE $tail]<0 } {
- # If this is "veryquick.test", do not run any of the malloc or
- # IO error simulations.
- if {[info exists ISVERYQUICK] && (
- [string match *malloc* $testfile] || [string match *ioerr* $testfile]
- ) } {
- continue
- }
- if {[lsearch -exact $EXCLUDE $tail]>=0} continue
- }
- if {[llength $INCLUDE]>0 && [lsearch -exact $INCLUDE $tail]<0} continue
+
if {[info exists STARTAT] && [string match $STARTAT $tail]} {unset STARTAT}
if {[info exists STARTAT]} continue
- source $testfile
- catch {db close}
- if {$sqlite_open_file_count>0} {
- puts "$tail did not close all files: $sqlite_open_file_count"
- fail_test $tail
- set sqlite_open_file_count 0
+
+ set run [expr {[llength $INCLUDE]==0}]
+ if {[info exists ISVERYQUICK] && [string match *malloc* $tail]} { set run 0 }
+ if {[info exists ISVERYQUICK] && [string match *ioerr* $tail]} { set run 0 }
+ if {[lsearch -exact $EXCLUDE $tail]>=0} { set run 0 }
+ if {[lsearch -exact $INCLUDE $tail]>=0} { set run 1 }
+ if {[lsearch -exact $QUICKTEST_INCLUDE $tail]>=0} { set run 1 }
+
+ if {$run} {
+ slave_test_file $testfile
}
}
-#set argv quick
-#source $testdir/permutations.test
-#set argv ""
-source $testdir/misuse.test
+slave_test_file $testdir/misuse.test
+
+finish_test
-set sqlite_open_file_count 0
-really_finish_test
sqlite3_finalize $STMT
} {SQLITE_OK}
-set permutation ""
-catch {set permutation $::permutations_test_prefix}
if {$tcl_platform(platform) == "unix"
- && $permutation ne "onefile"
- && $permutation ne "inmemory_journal"
+ && [permutation] ne "onefile"
+ && [permutation] ne "inmemory_journal"
} {
do_test rollback-2.1 {
execsql {
SELECT distinct tbl_name FROM sqlite_master;
} db2
} {t1 t3}
- if {[lsearch {exclusive persistent_journal no_journal} $permutation]<0} {
+ if {[lsearch {exclusive persistent_journal no_journal} [permutation]]<0} {
do_test rollback-2.3 {
file exists testA.db-journal
} 0
proc finish_test {} {}
set RTREE_EXCLUDE { }
-if {[info exists ISQUICK] && $ISQUICK} {
+if {[info exists G(isquick)] && $G(isquick)} {
set RTREE_EXCLUDE rtree3.test
}
CREATE INDEX i2 ON t1(y);
}
-if {0==[info exists ::savepoint6_iterations]} {
- set ::savepoint6_iterations 1000
+if {0==[info exists ::G(savepoint6_iterations)]} {
+ set ::G(savepoint6_iterations) 1000
}
#--------------------------------------------------------------------------
set testname tempdb
sqlite3 db ""
} {
- if {[catch {set ::permutations_test_prefix} z] == 0 && $z eq "journaltest"} {
+ if {[permutation] eq "journaltest"} {
continue
}
set testname nosync
checkdb
} {ok}
- for {set i 0} {$i < $::savepoint6_iterations} {incr i} {
+ for {set i 0} {$i < $::G(savepoint6_iterations)} {incr i} {
do_test savepoint6-$testname.$i.1 {
savepoint_op
checkdb
set testdir [file dirname $argv0]
source $testdir/tester.tcl
-#set ISQUICK 1
-
#-------------------------------------------------------------------------
# test_compound_select TESTNAME SELECT RESULT
#
set iLimitIncr 1
set iOffsetIncr 1
- if {[info exists ::ISQUICK] && $::ISQUICK && $nRow>=5} {
+ if {[info exists ::G(isquick)] && $::G(isquick) && $nRow>=5} {
set iOffsetIncr [expr $nRow / 5]
set iLimitIncr [expr $nRow / 5]
}
corruptC.test
}
-set ISQUICK 1
+set G(isquick) 1
set soak_starttime [clock seconds]
set soak_finishtime [expr {$soak_starttime + $TIMEOUT}]
if {[sqlite3 -has-codec]} {
set r "sqlite_orig HANDLE FILENAME ?-key CODEC-KEY?"
} else {
- set r "sqlite3 HANDLE FILENAME ?-vfs VFSNAME? ?-readonly BOOLEAN? ?-create BOOLEAN? ?-nomutex BOOLEAN? ?-fullmutex BOOLEAN?"
+ set r "sqlite_orig HANDLE FILENAME ?-vfs VFSNAME? ?-readonly BOOLEAN? ?-create BOOLEAN? ?-nomutex BOOLEAN? ?-fullmutex BOOLEAN?"
}
do_test tcl-1.1 {
set v [catch {sqlite3 bogus} msg]
# to be in memory. These variables are used to calculate the expected
# number of open files in the test cases below.
#
- set jrnl_in_memory [expr {
- [info exists ::permutations_test_prefix] &&
- $::permutations_test_prefix eq "inmemory_journal"
- }]
+ set jrnl_in_memory [expr {[permutation] eq "inmemory_journal"}]
set subj_in_memory [expr {$jrnl_in_memory || $TEMP_STORE == 3}]
db close
# integrity_check TESTNAME ?DB?
# do_test TESTNAME SCRIPT EXPECTED
#
-# Commands providing a lower level interface to the test counters:
+# Commands providing a lower level interface to the global test counters:
#
# set_test_counter COUNTER ?VALUE?
# omit_test TESTNAME REASON
#
# finish_test
#
-# Commands to help create test files that run with the "WAL" permutation:
+# Commands to help create test files that run with the "WAL" and other
+# permutations (see file permutations.test):
#
# wal_is_wal_mode
# wal_set_journal_mode ?DB?
# wal_check_journal_mode TESTNAME?DB?
+# permutation
#
# Set the precision of FP arithmatic used by the interpreter. And
#
# sqlite3 db test.db -key {xyzzy}
#
-if {[sqlite3 -has-codec] && [info command sqlite_orig]==""} {
+if {[info command sqlite_orig]==""} {
rename sqlite3 sqlite_orig
proc sqlite3 {args} {
if {[llength $args]==2 && [string index [lindex $args 0] 0]!="-"} {
- lappend args -key {xyzzy}
+ # This command is opening a new database connection.
+ #
+ if {[info exists ::G(perm:sqlite3_args)]} {
+ set args [concat $args $::G(perm:sqlite3_args)]
+ }
+ if {[sqlite_orig -has-codec]} {
+ lappend args -key {xyzzy}
+ }
+
+ uplevel 1 sqlite_orig $args
+
+ if {[info exists ::G(perm:presql)]} {
+ [lindex $args 0] eval $::G(perm:presql)
+ }
+ } else {
+ # This command is not opening a new database connection. Pass the
+ # arguments through to the C implemenation as the are.
+ #
+ uplevel 1 sqlite_orig $args
}
- uplevel 1 sqlite_orig $args
}
}
-# The following block only runs the first time this file is sourced.
+# The following block only runs the first time this file is sourced. It
+# does not run in slave interpreters (since the ::cmdlinearg array is
+# populated before the test script is run in slave interpreters).
#
if {[info exists cmdlinearg]==0} {
}
set argv $leftover
+ # Install the malloc layer used to inject OOM errors. And the 'automatic'
+ # extensions. This only needs to be done once for the process.
+ #
sqlite3_shutdown
install_malloc_faultsim 1
sqlite3_initialize
autoinstall_test_functions
+ # If the --binarylog option was specified, create the logging VFS. This
+ # call installs the new VFS as the default for all SQLite connections.
+ #
if {$cmdlinearg(binarylog)} {
vfslog new binarylog {} vfslog.bin
}
}
}
if {!$go} return
+
+ if {[info exists ::G(perm:name)]} {
+ set name "$::G(perm:name)-$name"
+ }
+
incr_ntest
puts -nonewline $name...
flush stdout
}
#-------------------------------------------------------------------------
-# If a test script is executed with global variable
-# $::permutations_test_prefix set to "wal", then the tests are run
-# in WAL mode. Otherwise, they should be run in rollback mode. The
-# following Tcl procs are used to make this less intrusive:
+# If a test script is executed with global variable $::G(perm:name) set to
+# "wal", then the tests are run in WAL mode. Otherwise, they should be run
+# in rollback mode. The following Tcl procs are used to make this less
+# intrusive:
#
# wal_set_journal_mode ?DB?
#
# Returns true if this test should be run in WAL mode. False otherwise.
#
proc wal_is_wal_mode {} {
- expr { [catch {set ::permutations_test_prefix} v]==0 && $v == "wal" }
+ expr {[permutation] eq "wal"}
}
proc wal_set_journal_mode {{db db}} {
if { [wal_is_wal_mode] } {
}
}
+proc permutation {} {
+ set perm ""
+ catch {set perm $::G(perm:name)}
+ set perm
+}
+
#-------------------------------------------------------------------------
#
proc slave_test_script {script} {
# Set up the ::cmdlinearg array in the slave.
interp eval tinterp [list array set ::cmdlinearg [array get ::cmdlinearg]]
+ # Set up the ::G array in the slave.
+ interp eval tinterp [list array set ::G [array get ::G]]
+
# Load the various test interfaces implemented in C.
load_testfixture_extensions tinterp
interp delete tinterp
}
-proc slave_test_file {file} {
- set zFile [file join $::testdir $file]
+proc slave_test_file {zFile} {
+
+ set ::sqlite_open_file_count 0
+
set time [time {
slave_test_script [list source $zFile]
}]
- puts "time $file [lrange $time 0 1]"
+
+ set tail [file tail $zFile]
+ if {$::sqlite_open_file_count>0} {
+ puts "$tail did not close all files: $::sqlite_open_file_count"
+ fail_test $tail
+ set ::sqlite_open_file_count 0
+ exit
+ }
+ puts "time $tail [lrange $time 0 1]"
+
+ show_memstats
}
# is in use, only 20 iterations. Otherwise the test pcache runs out
# of page slots and SQLite reports "out of memory".
#
-if {[info exists ISQUICK] || (
- $TEMP_STORE==3 && [catch {set ::permutations_test_prefix} val]==0 &&
- [regexp {^pcache[[:digit:]]*$} $val]
+if {[info exists G(isquick)] || (
+ $TEMP_STORE==3 && [regexp {^pcache[[:digit:]]*$} [permutation]]
) } {
set limit 20
-} elseif {[info exists SOAKTEST]} {
+} elseif {[info exists G(issoak)]} {
set limit 100
} else {
set limit 40
projects / thirdparty / sqlite.git / commitdiff
