mirrors/sqlite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix minor test suite problems causing errors on OSX.

Browse Source 
FossilOrigin-Name: 759c954fee215a64f21fe13491515eebebbc6d01
This commit is contained in:
dan 2010-10-06 16:42:52 +00:00
parent d468ad6559
commit 14d14607a5
4 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
manifest
View File

@ -1,5 +1,5 @@
C Fix\sa\sbug\sin\stest\scode\sthat\swas\scausing\sa\svalgrind\serror.\sNo\schanges\sto\sproduction\scode.
D 2010-10-06T09:57:33
C Fix\sminor\stest\ssuite\sproblems\scausing\serrors\son\sOSX.
D 2010-10-06T16:42:53
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in c599a15d268b1db2aeadea19df2adc3bf2eb6bee
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@ -506,7 +506,7 @@ F test/lock2.test 5242d8ac4e2d59c403aebff606af449b455aceff
F test/lock3.test f271375930711ae044080f4fe6d6eda930870d00
F test/lock4.test c82268c031d39345d05efa672f80b025481b3ae5
F test/lock5.test b2abb5e711bc59b0eae00f6c97a36ec9f458fada
F test/lock6.test 8df56060f396151777390982422c800d026e1722
F test/lock6.test ad5b387a3a8096afd3c68a55b9535056431b0cf5
F test/lock7.test 64006c84c1c616657e237c7ad6532b765611cf64
F test/lock_common.tcl 43fef46b1c5b8ac05e382eab214705c23c70bc88
F test/lookaside.test 382e7bc2fab23d902c8eafb1b9ed7ababfff75a6
@ -568,7 +568,7 @@ F test/pagesize.test 76aa9f23ecb0741a4ed9d2e16c5fa82671f28efb
F test/pcache.test 4118a183908ecaed343a06fcef3ba82e87e0129d
F test/pcache2.test 0d85f2ab6963aee28c671d4c71bec038c00a1d16
F test/permutations.test ca1c985cf68c692096d0325b33c62f2b576446a5
F test/pragma.test ed78d200f65c6998df51196cb8c39d5300570f24
F test/pragma.test fdfc09067ea104a0c247a1a79d8093b56656f850
F test/pragma2.test 5364893491b9231dd170e3459bfc2e2342658b47
F test/printf.test 05970cde31b1a9f54bd75af60597be75a5c54fea
F test/progress.test 5b075c3c790c7b2a61419bc199db87aaf48b8301
@ -872,7 +872,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
P d7d4a94fc1209fd32d7c8e20ac83eb169b81ee25
R 7a4920bbbcb12c8aef5934d1e5561d95
P f29da7bec68fa2cdd97c75b30f7ab25c96f8d49a
R f6ee88c33c88377138fd0e936582123a
U dan
Z 8761aff7ff07ce64453db2bd31e9be01
Z 0a6a348b6e59062f1f3c2d42f48437e9

2
manifest.uuid
View File

@ -1 +1 @@
f29da7bec68fa2cdd97c75b30f7ab25c96f8d49a
759c954fee215a64f21fe13491515eebebbc6d01

8
test/lock6.test
View File

@ -112,10 +112,10 @@ ifcapable lock_proxy_pragmas&&prefer_proxy_locking {
sqlite3_soft_heap_limit 0
do_test lock6-1.3 {
sqlite3 db test.db
catchsql {
select * from sqlite_master;
}
list [catch {
sqlite3 db test.db
execsql { select * from sqlite_master }
} msg] $msg
} {1 {database is locked}}
do_test lock6-1.4 {

22
test/pragma.test
View File

@ -1379,21 +1379,21 @@ ifcapable lock_proxy_pragmas&&prefer_proxy_locking {
set sqlite_hostid_num 2
do_test pragma-16.7 {
sqlite3 db test2.db
execsql {
PRAGMA lock_proxy_file=":auto:";
}
catchsql {
select * from sqlite_master;
}
list [catch {
sqlite3 db test2.db
execsql {
PRAGMA lock_proxy_file=":auto:";
select * from sqlite_master;
}
} msg] $msg
} {1 {database is locked}}
db close
do_test pragma-16.8 {
sqlite3 db test2.db
catchsql {
select * from sqlite_master;
}
list [catch {
sqlite3 db test2.db
execsql { select * from sqlite_master }
} msg] $msg
} {1 {database is locked}}
db2 close