Change wal.test and walhook.test so that they work with DEFAULT_AUTOVACUUM=1 builds.
FossilOrigin-Name: 4cde92909c20982f7d4e6b550f55d786df398ccd
This commit is contained in:
parent
65f2ac58b6
commit
65bddc1223
16
manifest
16
manifest
@ -1,5 +1,5 @@
|
|||||||
C Test\sanother\sIO\serror\scase\sin\swal.c.
|
C Change\swal.test\sand\swalhook.test\sso\sthat\sthey\swork\swith\sDEFAULT_AUTOVACUUM=1\sbuilds.
|
||||||
D 2010-05-07T09:43:50
|
D 2010-05-07T12:49:23
|
||||||
F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
|
F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
|
||||||
F Makefile.in a5cad1f8f3e021356bfcc6c77dc16f6f1952bbc3
|
F Makefile.in a5cad1f8f3e021356bfcc6c77dc16f6f1952bbc3
|
||||||
F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
|
F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
|
||||||
@ -535,7 +535,7 @@ F test/pageropt.test 3ee6578891baaca967f0bd349e4abfa736229e1a
|
|||||||
F test/pagesize.test 76aa9f23ecb0741a4ed9d2e16c5fa82671f28efb
|
F test/pagesize.test 76aa9f23ecb0741a4ed9d2e16c5fa82671f28efb
|
||||||
F test/pcache.test eebc4420b37cb07733ae9b6e99c9da7c40dd6d58
|
F test/pcache.test eebc4420b37cb07733ae9b6e99c9da7c40dd6d58
|
||||||
F test/pcache2.test 0d85f2ab6963aee28c671d4c71bec038c00a1d16
|
F test/pcache2.test 0d85f2ab6963aee28c671d4c71bec038c00a1d16
|
||||||
F test/permutations.test 8923516a21e6ab0874ce4887291fe1424c01dc2c
|
F test/permutations.test d5872f8d7f854e0e78d127a7e148c58b2703c8a8
|
||||||
F test/pragma.test 6960f9efbce476f70ba9ee2171daf5042f9e3d8a
|
F test/pragma.test 6960f9efbce476f70ba9ee2171daf5042f9e3d8a
|
||||||
F test/pragma2.test 5364893491b9231dd170e3459bfc2e2342658b47
|
F test/pragma2.test 5364893491b9231dd170e3459bfc2e2342658b47
|
||||||
F test/printf.test 05970cde31b1a9f54bd75af60597be75a5c54fea
|
F test/printf.test 05970cde31b1a9f54bd75af60597be75a5c54fea
|
||||||
@ -761,12 +761,12 @@ F test/vtabE.test 7c4693638d7797ce2eda17af74292b97e705cc61
|
|||||||
F test/vtab_alter.test 9e374885248f69e251bdaacf480b04a197f125e5
|
F test/vtab_alter.test 9e374885248f69e251bdaacf480b04a197f125e5
|
||||||
F test/vtab_err.test 0d4d8eb4def1d053ac7c5050df3024fd47a3fbd8
|
F test/vtab_err.test 0d4d8eb4def1d053ac7c5050df3024fd47a3fbd8
|
||||||
F test/vtab_shared.test 0eff9ce4f19facbe0a3e693f6c14b80711a4222d
|
F test/vtab_shared.test 0eff9ce4f19facbe0a3e693f6c14b80711a4222d
|
||||||
F test/wal.test 45fd4e9e8f871f38c801fecbf341528710edbfe1
|
F test/wal.test 02d97e02d20612be5c699d9588fa96afa4978625
|
||||||
F test/wal2.test 0f53c711d6530d3c7aba46752aef9fd44b708c6c
|
F test/wal2.test 0f53c711d6530d3c7aba46752aef9fd44b708c6c
|
||||||
F test/walbak.test a0e45187c7d8928df035dfea29b99b016b21ca3c
|
F test/walbak.test a0e45187c7d8928df035dfea29b99b016b21ca3c
|
||||||
F test/walcrash.test f6d5fb2bb108876f04848720a488065d9deef69f
|
F test/walcrash.test f6d5fb2bb108876f04848720a488065d9deef69f
|
||||||
F test/walfault.test bff34172bc224360d9c0d6c7b94454817c8def9d
|
F test/walfault.test bff34172bc224360d9c0d6c7b94454817c8def9d
|
||||||
F test/walhook.test a1c375ae791d5d7d511c166159729230791c574d
|
F test/walhook.test c3314e30baf074dd087d52d21ea6f1d09138b0a0
|
||||||
F test/walmode.test bac6f06544a8554588a1543def996bbe2fc41792
|
F test/walmode.test bac6f06544a8554588a1543def996bbe2fc41792
|
||||||
F test/walslow.test d21625e2e99e11c032ce949e8a94661576548933
|
F test/walslow.test d21625e2e99e11c032ce949e8a94661576548933
|
||||||
F test/walthread.test 1a8c55cd9e3272ba0caa028d8f0ead04989a3378
|
F test/walthread.test 1a8c55cd9e3272ba0caa028d8f0ead04989a3378
|
||||||
@ -813,7 +813,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
|
|||||||
F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
|
F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
|
||||||
F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
|
F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
|
||||||
F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
|
F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
|
||||||
P 8f94bde568be52ecc5a976b7a09776ea7b4bb511
|
P 8b3b5ab8fa61ca4ef22c98abaab397707ee74ea3
|
||||||
R 33b989a7a16e1f991ebc72039614fbc6
|
R e7238cbb06ee83e373411c84dd27fcae
|
||||||
U dan
|
U dan
|
||||||
Z e205369239a9a134e8a3ad914124f7a7
|
Z ecedfccdbaabbf8db5ab000decba8baf
|
||||||
|
@ -1 +1 @@
|
|||||||
8b3b5ab8fa61ca4ef22c98abaab397707ee74ea3
|
4cde92909c20982f7d4e6b550f55d786df398ccd
|
@ -73,7 +73,6 @@ set EXCLUDE {
|
|||||||
fuzz_malloc.test misuse.test veryquick.test
|
fuzz_malloc.test misuse.test veryquick.test
|
||||||
fuzz.test mutex2.test vtab_err.test
|
fuzz.test mutex2.test vtab_err.test
|
||||||
lookaside.test fuzz3.test savepoint4.test
|
lookaside.test fuzz3.test savepoint4.test
|
||||||
savepoint6.test
|
|
||||||
}
|
}
|
||||||
set ALLTESTS [list]
|
set ALLTESTS [list]
|
||||||
foreach filename [glob $testdir/*.test] {
|
foreach filename [glob $testdir/*.test] {
|
||||||
@ -744,7 +743,6 @@ run_tests "journaltest" -description {
|
|||||||
crash8.test
|
crash8.test
|
||||||
async4.test
|
async4.test
|
||||||
bigfile.test
|
bigfile.test
|
||||||
savepoint6.test
|
|
||||||
}]
|
}]
|
||||||
|
|
||||||
if {[info commands register_demovfs] != ""} {
|
if {[info commands register_demovfs] != ""} {
|
||||||
|
@ -33,6 +33,7 @@ proc blob {nByte} {
|
|||||||
|
|
||||||
proc sqlite3_wal {args} {
|
proc sqlite3_wal {args} {
|
||||||
eval sqlite3 $args
|
eval sqlite3 $args
|
||||||
|
[lindex $args 0] eval { PRAGMA auto_vacuum = 0 }
|
||||||
[lindex $args 0] eval { PRAGMA page_size = 1024 }
|
[lindex $args 0] eval { PRAGMA page_size = 1024 }
|
||||||
[lindex $args 0] eval { PRAGMA journal_mode = wal }
|
[lindex $args 0] eval { PRAGMA journal_mode = wal }
|
||||||
[lindex $args 0] eval { PRAGMA synchronous = normal }
|
[lindex $args 0] eval { PRAGMA synchronous = normal }
|
||||||
@ -61,6 +62,7 @@ proc log_deleted {logfile} {
|
|||||||
#
|
#
|
||||||
|
|
||||||
do_test wal-0.1 {
|
do_test wal-0.1 {
|
||||||
|
execsql { PRAGMA auto_vacuum = 0 }
|
||||||
execsql { PRAGMA synchronous = normal }
|
execsql { PRAGMA synchronous = normal }
|
||||||
execsql { PRAGMA journal_mode = wal }
|
execsql { PRAGMA journal_mode = wal }
|
||||||
} {wal}
|
} {wal}
|
||||||
@ -337,6 +339,7 @@ foreach sector {512 4096} {
|
|||||||
sqlite3 db test.db -vfs devsym
|
sqlite3 db test.db -vfs devsym
|
||||||
execsql "
|
execsql "
|
||||||
PRAGMA page_size = $pgsz;
|
PRAGMA page_size = $pgsz;
|
||||||
|
PRAGMA auto_vacuum = 0;
|
||||||
PRAGMA journal_mode = wal;
|
PRAGMA journal_mode = wal;
|
||||||
"
|
"
|
||||||
execsql "
|
execsql "
|
||||||
@ -908,14 +911,15 @@ do_test wal-13.2.1 {
|
|||||||
execsql { SELECT count(*) FROM t2 }
|
execsql { SELECT count(*) FROM t2 }
|
||||||
} {1}
|
} {1}
|
||||||
do_test wal-13.2.2 {
|
do_test wal-13.2.2 {
|
||||||
|
db function blob blob
|
||||||
for {set i 0} {$i < 16} {incr i} {
|
for {set i 0} {$i < 16} {incr i} {
|
||||||
execsql { INSERT INTO t2 SELECT randomblob(400), randomblob(400) FROM t2 }
|
execsql { INSERT INTO t2 SELECT blob(400), blob(400) FROM t2 }
|
||||||
}
|
}
|
||||||
execsql { SELECT count(*) FROM t2 }
|
execsql { SELECT count(*) FROM t2 }
|
||||||
} [expr int(pow(2, 16))]
|
} [expr int(pow(2, 16))]
|
||||||
do_test wal-13.2.1 {
|
do_test wal-13.2.3 {
|
||||||
file size test.db-wal
|
file size test.db-wal
|
||||||
} [log_file_size 33123 1024]
|
} [log_file_size 33502 1024]
|
||||||
|
|
||||||
foreach code [list {
|
foreach code [list {
|
||||||
set tn 3
|
set tn 3
|
||||||
@ -1013,6 +1017,7 @@ file delete -force test.db test.db-wal
|
|||||||
sqlite3 db test.db
|
sqlite3 db test.db
|
||||||
do_test wal-15.1 {
|
do_test wal-15.1 {
|
||||||
execsql {
|
execsql {
|
||||||
|
PRAGMA auto_vacuum = 0;
|
||||||
PRAGMA page_size = 1024;
|
PRAGMA page_size = 1024;
|
||||||
PRAGMA journal_mode = WAL;
|
PRAGMA journal_mode = WAL;
|
||||||
}
|
}
|
||||||
@ -1109,6 +1114,8 @@ foreach {tn ckpt_cmd ckpt_res ckpt_main ckpt_aux} {
|
|||||||
sqlite3 db test.db
|
sqlite3 db test.db
|
||||||
execsql {
|
execsql {
|
||||||
ATTACH 'test2.db' AS aux;
|
ATTACH 'test2.db' AS aux;
|
||||||
|
PRAGMA main.auto_vacuum = 0;
|
||||||
|
PRAGMA aux.auto_vacuum = 0;
|
||||||
PRAGMA main.journal_mode = WAL;
|
PRAGMA main.journal_mode = WAL;
|
||||||
PRAGMA aux.journal_mode = WAL;
|
PRAGMA aux.journal_mode = WAL;
|
||||||
PRAGMA synchronous = NORMAL;
|
PRAGMA synchronous = NORMAL;
|
||||||
@ -1303,6 +1310,10 @@ foreach {tn pgsz works} {
|
|||||||
11 1020 0
|
11 1020 0
|
||||||
} {
|
} {
|
||||||
|
|
||||||
|
if {$::SQLITE_MAX_PAGE_SIZE < $pgsz} {
|
||||||
|
set works 0
|
||||||
|
}
|
||||||
|
|
||||||
for {set pg 1} {$pg <= 3} {incr pg} {
|
for {set pg 1} {$pg <= 3} {incr pg} {
|
||||||
file copy -force testX.db test.db
|
file copy -force testX.db test.db
|
||||||
file delete -force test.db-wal
|
file delete -force test.db-wal
|
||||||
|
@ -36,6 +36,7 @@ db wal_hook wal_hook
|
|||||||
do_test walhook-1.1 {
|
do_test walhook-1.1 {
|
||||||
execsql {
|
execsql {
|
||||||
PRAGMA page_size = 1024;
|
PRAGMA page_size = 1024;
|
||||||
|
PRAGMA auto_vacuum = 0;
|
||||||
PRAGMA journal_mode = wal;
|
PRAGMA journal_mode = wal;
|
||||||
PRAGMA synchronous = normal;
|
PRAGMA synchronous = normal;
|
||||||
CREATE TABLE t1(i PRIMARY KEY, j);
|
CREATE TABLE t1(i PRIMARY KEY, j);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user