Fix a problem introduced into lock2.test by the previous commit.
FossilOrigin-Name: c1c9f6fa9d75df740e577dbc5e6a24b91ad2bdd0
This commit is contained in:
dan
parent
e91a54e1be
commit
2fce9ab3f8
16
manifest
16
manifest
@ -1,5 +1,5 @@
|
||||
C Add\stest\sfile\spager1.test,\scontaining\stests\sof\sinter-process\slocking\sin\snon-wal\smode.
|
||||
D 2010-06-15T17:44:48
|
||||
C Fix\sa\sproblem\sintroduced\sinto\slock2.test\sby\sthe\sprevious\scommit.
|
||||
D 2010-06-15T18:00:06
|
||||
F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
|
||||
F Makefile.in a5cad1f8f3e021356bfcc6c77dc16f6f1952bbc3
|
||||
F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
|
||||
@ -478,7 +478,7 @@ F test/limit.test 2db7b3b34fb925b8e847d583d2eb67531d0ce67e
|
||||
F test/loadext.test 0393ce12d9616aa87597dd0ec88181de181f6db0
|
||||
F test/loadext2.test 0bcaeb4d81cd5b6e883fdfea3c1bdbe1f173cbca
|
||||
F test/lock.test 842e80b6be816c79525a20b098cca066989feed7
|
||||
F test/lock2.test ef2df66eaf3cd40220cf0ce5fe63ddd2437cf09a
|
||||
F test/lock2.test fd305c95b15a6be93416bddcfc923698fc56bd71
|
||||
F test/lock3.test f271375930711ae044080f4fe6d6eda930870d00
|
||||
F test/lock4.test f4f36271aa5ae1da449646bf43c7341f6b2b4c4e
|
||||
F test/lock5.test 6b1f78f09ad1522843dad571b76b321e6f439bf7
|
||||
@ -538,7 +538,7 @@ F test/pageropt.test 8146bf448cf09e87bb1867c2217b921fb5857806
|
||||
F test/pagesize.test 76aa9f23ecb0741a4ed9d2e16c5fa82671f28efb
|
||||
F test/pcache.test eebc4420b37cb07733ae9b6e99c9da7c40dd6d58
|
||||
F test/pcache2.test 0d85f2ab6963aee28c671d4c71bec038c00a1d16
|
||||
F test/permutations.test 403099a8e191b43e5df19b8199b80178b3ece1d6
|
||||
F test/permutations.test 339011035e1113ab166975572d9333b9eb690d2b
|
||||
F test/pragma.test 6960f9efbce476f70ba9ee2171daf5042f9e3d8a
|
||||
F test/pragma2.test 5364893491b9231dd170e3459bfc2e2342658b47
|
||||
F test/printf.test 05970cde31b1a9f54bd75af60597be75a5c54fea
|
||||
@ -609,7 +609,7 @@ F test/tclsqlite.test 8c154101e704170c2be10f137a5499ac2c6da8d3
|
||||
F test/tempdb.test 800c36623d67a2ad1f58784b9c5644e0405af6e6
|
||||
F test/temptable.test f42121a0d29a62f00f93274464164177ab1cc24a
|
||||
F test/temptrigger.test b0273db072ce5f37cf19140ceb1f0d524bbe9f05
|
||||
F test/tester.tcl b96dad16be6c874703056199d52314f7d56e6f64
|
||||
F test/tester.tcl 7912c3c8768320fd7bcb217637c2f0a607fbbc24
|
||||
F test/thread001.test a3e6a7254d1cb057836cb3145b60c10bf5b7e60f
|
||||
F test/thread002.test afd20095e6e845b405df4f2c920cb93301ca69db
|
||||
F test/thread003.test b824d4f52b870ae39fc5bae4d8070eca73085dca
|
||||
@ -821,7 +821,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
|
||||
F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
|
||||
F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
|
||||
F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
|
||||
P ea80cbe51e33d6a3f15a4ad56f360fc5323866de
|
||||
R 2d037491154b033cfc4dcca7e9e50afd
|
||||
P 6e43eed9310bae9ca5e91f8fd9eafc45a16b7019
|
||||
R 8779aa903d62615a17eba65fcdac083a
|
||||
U dan
|
||||
Z 2d173a77ac2cf0416b30cd54aeed8e9e
|
||||
Z 19627af153a648d842fa403de154602d
|
||||
|
||||
@ -1 +1 @@
|
||||
6e43eed9310bae9ca5e91f8fd9eafc45a16b7019
|
||||
c1c9f6fa9d75df740e577dbc5e6a24b91ad2bdd0
|
||||
@ -59,9 +59,8 @@ do_test lock2-1.3 {
|
||||
} {}
|
||||
do_test lock2-1.4 {
|
||||
testfixture $::tf1 {
|
||||
db eval {
|
||||
CREATE TABLE def(d, e, f)
|
||||
}
|
||||
catch { db eval { CREATE TABLE def(d, e, f) } } msg
|
||||
set msg
|
||||
}
|
||||
} {database is locked}
|
||||
do_test lock2-1.5 {
|
||||
@ -79,10 +78,11 @@ do_test lock2-1.6 {
|
||||
} {}
|
||||
do_test lock2-1.7 {
|
||||
testfixture $::tf1 {
|
||||
db eval {
|
||||
catch { db eval {
|
||||
BEGIN;
|
||||
SELECT * FROM sqlite_master;
|
||||
}
|
||||
} } msg
|
||||
set msg
|
||||
}
|
||||
} {database is locked}
|
||||
do_test lock2-1.8 {
|
||||
|
||||
@ -24,7 +24,7 @@ db close
|
||||
# -shutdown SCRIPT (default "")
|
||||
# -presql SQL (default "")
|
||||
# -files LIST-OF-FILES (default $::ALLTESTS)
|
||||
#
|
||||
# -prefix NAME (default "$::NAME.")
|
||||
#
|
||||
proc test_suite {name args} {
|
||||
|
||||
@ -32,7 +32,8 @@ proc test_suite {name args} {
|
||||
set default(-initialize) ""
|
||||
set default(-presql) ""
|
||||
set default(-description) "no description supplied (fixme)"
|
||||
set default(-files) ""
|
||||
set default(-files) ""
|
||||
set default(-prefix) "${name}."
|
||||
|
||||
array set options [array get default]
|
||||
if {[llength $args]%2} {
|
||||
@ -79,9 +80,8 @@ proc test_set {args} {
|
||||
# various test scripts:
|
||||
#
|
||||
# $alltests
|
||||
# $slowtests
|
||||
# $allquicktests
|
||||
#
|
||||
|
||||
set alltests [list]
|
||||
foreach f [glob $testdir/*.test] { lappend alltests [file tail $f] }
|
||||
if {$::tcl_platform(platform)!="unix"} {
|
||||
@ -122,7 +122,7 @@ set allquicktests [test_set $alltests -exclude {
|
||||
#
|
||||
lappend ::testsuitelist xxx
|
||||
|
||||
test_suite "veryquick" -description {
|
||||
test_suite "veryquick" -prefix "" -description {
|
||||
"Very" quick test suite. Runs in less than 5 minutes on a workstation.
|
||||
This test suite is the same as the "quick" tests, except that some files
|
||||
that test malloc and IO errors are omitted.
|
||||
@ -130,20 +130,20 @@ test_suite "veryquick" -description {
|
||||
test_set $allquicktests -exclude *malloc* *ioerr* *fault*
|
||||
]
|
||||
|
||||
test_suite "quick" -description {
|
||||
test_suite "quick" -prefix "" -description {
|
||||
Quick test suite. Runs in around 10 minutes on a workstation.
|
||||
} -files [
|
||||
test_set $allquicktests
|
||||
]
|
||||
|
||||
test_suite "veryquick_plus_notify2" -description {
|
||||
test_suite "veryquick_plus_notify2" -prefix "" -description {
|
||||
Very quick test suite + file notify2.test. This is used by one of the
|
||||
sqlite.org release test configurations.
|
||||
} -files [
|
||||
test_set $allquicktests notify2.test -exclude *malloc* *ioerr* *fault*
|
||||
]
|
||||
|
||||
test_suite "full" -description {
|
||||
test_suite "full" -prefix "" -description {
|
||||
Full test suite. Takes a long time.
|
||||
} -files [
|
||||
test_set $alltests
|
||||
@ -777,16 +777,17 @@ test_suite "wal" -description {
|
||||
#
|
||||
# where available options are:
|
||||
#
|
||||
# -description TITLE (default "")
|
||||
# -initialize SCRIPT (default "")
|
||||
# -shutdown SCRIPT (default "")
|
||||
# -presql SQL (default "")
|
||||
# -files LIST-OF-FILES (default "")
|
||||
# -description TITLE
|
||||
# -initialize SCRIPT
|
||||
# -shutdown SCRIPT
|
||||
# -presql SQL
|
||||
# -files LIST-OF-FILES
|
||||
# -prefix NAME
|
||||
#
|
||||
proc run_tests {name args} {
|
||||
array set options $args
|
||||
|
||||
set ::G(perm:name) $name
|
||||
set ::G(perm:name) $options(-prefix)
|
||||
set ::G(perm:presql) $options(-presql)
|
||||
set ::G(isquick) 1
|
||||
|
||||
|
||||
@ -299,7 +299,7 @@ proc do_test {name cmd expected} {
|
||||
if {!$go} return
|
||||
|
||||
if {[info exists ::G(perm:name)]} {
|
||||
set name "$::G(perm:name).$name"
|
||||
set name "$::G(perm:name)$name"
|
||||
}
|
||||
|
||||
incr_ntest
|
||||
|
||||
Loading…
Reference in New Issue
Block a user