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

Fix memdb.test so that it works when OMIT_AUTOVACUUM is defined. (CVS 6649)

Browse Source 
FossilOrigin-Name: 8c3c0c24c82606df41653dbf7324bf9f166c933a
This commit is contained in:
danielk1977 2009-05-18 16:04:38 +00:00
parent ccfcbcea60
commit 8d76ff9fe9
3 changed files with 28 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
manifest
View File

@ -1,5 +1,5 @@
C Changes\sto\sselect.c\sin\ssupport\sof\sfull\scoverage\stesting.\s(CVS\s6647)
D 2009-05-18T15:46:08
C Fix\smemdb.test\sso\sthat\sit\sworks\swhen\sOMIT_AUTOVACUUM\sis\sdefined.\s(CVS\s6649)
D 2009-05-18T16:04:38
F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
F Makefile.in 583e87706abc3026960ed759aff6371faf84c211
F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@ -466,7 +466,7 @@ F test/mallocJ.test b5d1839da331d96223e5f458856f8ffe1366f62e
F test/mallocK.test d79968641d1b70d88f6c01bdb9a7eb4a55582cc9
F test/malloc_common.tcl 984baeb6c6b185e798827d1187d426acc2bc4962
F test/manydb.test b3d3bc4c25657e7f68d157f031eb4db7b3df0d3c
F test/memdb.test 09240c19e95b063e193b95d6e3eb99f528fbc2dd
F test/memdb.test 0825155b2290e900264daaaf0334b6dfe69ea498
F test/memleak.test d2d2a1ff7105d32dc3fdf691458cf6cba58c7217
F test/memsubsys1.test 66e90b4f16d8501ffd2e68ff2446c29ce66ecd84
F test/memsubsys2.test 72a731225997ad5e8df89fdbeae9224616b6aecc
@ -729,7 +729,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
P 43051e0315246d734a81ccef2cf1a0cc159f239b
R 38f7f1975b86b5c904b4bdaa151080a5
U drh
Z fa4ce17ae5118cad70d4b23a7eeee79b
P e225f365bd9353f753161887e05fe1eccaf9be1d
R c1d4b25855a527f4367ea56dd49e9021
U danielk1977
Z ceec3f5da743681d72936856d6abbe9f

2
manifest.uuid
View File

@ -1 +1 @@
e225f365bd9353f753161887e05fe1eccaf9be1d
8c3c0c24c82606df41653dbf7324bf9f166c933a

39
test/memdb.test
View File

@ -11,7 +11,7 @@
# This file implements regression tests for SQLite library. The
# focus of this script is in-memory database backend.
#
# $Id: memdb.test,v 1.18 2009/03/18 10:33:02 danielk1977 Exp $
# $Id: memdb.test,v 1.19 2009/05/18 16:04:38 danielk1977 Exp $
set testdir [file dirname $argv0]
@ -413,24 +413,25 @@ do_test memdb-8.2 {
# Test that auto-vacuum works with in-memory databases.
#
do_test memdb-9.1 {
db close
sqlite3 db test.db
db cache size 0
execsql {
PRAGMA auto_vacuum = full;
CREATE TABLE t1(a);
INSERT INTO t1 VALUES(randstr(1000,1000));
INSERT INTO t1 VALUES(randstr(1000,1000));
INSERT INTO t1 VALUES(randstr(1000,1000));
}
set memused [lindex [sqlite3_status SQLITE_STATUS_MEMORY_USED 0] 1]
set pgovfl [lindex [sqlite3_status SQLITE_STATUS_PAGECACHE_OVERFLOW 0] 1]
execsql { DELETE FROM t1 }
set memused2 [lindex [sqlite3_status SQLITE_STATUS_MEMORY_USED 0] 1]
expr {($memused2 + 2048 < $memused) || $pgovfl==0}
} {1}
ifcapable autovacuum {
do_test memdb-9.1 {
db close
sqlite3 db test.db
db cache size 0
execsql {
PRAGMA auto_vacuum = full;
CREATE TABLE t1(a);
INSERT INTO t1 VALUES(randstr(1000,1000));
INSERT INTO t1 VALUES(randstr(1000,1000));
INSERT INTO t1 VALUES(randstr(1000,1000));
}
set memused [lindex [sqlite3_status SQLITE_STATUS_MEMORY_USED 0] 1]
set pgovfl [lindex [sqlite3_status SQLITE_STATUS_PAGECACHE_OVERFLOW 0] 1]
execsql { DELETE FROM t1 }
set memused2 [lindex [sqlite3_status SQLITE_STATUS_MEMORY_USED 0] 1]
expr {($memused2 + 2048 < $memused) || $pgovfl==0}
} {1}
}
} ;# ifcapable memorydb