Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1913)

Unified Diff: third_party/sqlite/src/test/exclusive2.test

Issue 6990047: Import SQLite 3.7.6.3. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/sqlite/src/test/exclusive.test ('k') | third_party/sqlite/src/test/exists.test » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/sqlite/src/test/exclusive2.test
diff --git a/third_party/sqlite/src/test/exclusive2.test b/third_party/sqlite/src/test/exclusive2.test
index f38ddcf8bc722755c6cbcf1c5e8178dce052858b..18f304dbbe30b50a826d145408222f1ea7f923a0 100644
--- a/third_party/sqlite/src/test/exclusive2.test
+++ b/third_party/sqlite/src/test/exclusive2.test
@@ -15,6 +15,11 @@
set testdir [file dirname $argv0]
source $testdir/tester.tcl
+# Do not use a codec for tests in this file, as the database file is
+# manipulated directly using tcl scripts (using the [hexio_write] command).
+#
+do_not_use_codec
+
ifcapable {!pager_pragmas} {
finish_test
return
@@ -83,7 +88,7 @@ do_test exclusive2-1.0 {
# The following tests - exclusive2-1.X - check that:
#
# 1-3: Build a database with connection 1, calculate a signature.
-# 4-9: Modify the database using a second connection in a way that
+# 4-7: Modify the database using a second connection in a way that
# does not modify the freelist, then reset the pager change-counter
# to the value it had before the modifications.
# 8: Check that using the first connection, the database signature
@@ -99,6 +104,11 @@ do_test exclusive2-1.0 {
# the cache size must be at least 17. Otherwise, some pages will be
# loaded from the database file in step 8.
#
+# For similar reasons, this test does not work with the memsubsys1 permutation.
+# Permutation memsubsys1 configures the pcache subsystem to use a static
+# allocation of 24 pages (shared between all pagers). This is not enough for
+# this test.
+#
do_test exclusive2-1.1 {
execsql {
BEGIN;
@@ -146,16 +156,19 @@ do_test exclusive2-1.6 {
do_test exclusive2-1.7 {
pagerChangeCounter test.db 1
} {1}
-do_test exclusive2-1.9 {
- t1sig
- expr {[t1sig] eq $::sig}
-} {1}
+if {[permutation] != "memsubsys1"} {
+ do_test exclusive2-1.9 {
+ t1sig
+ expr {[t1sig] eq $::sig}
+ } {1}
+}
do_test exclusive2-1.10 {
pagerChangeCounter test.db 2
} {2}
do_test exclusive2-1.11 {
expr {[t1sig] eq $::sig}
} {0}
+db2 close
#--------------------------------------------------------------------
# These tests - exclusive2-2.X - are similar to exclusive2-1.X,
@@ -245,7 +258,6 @@ do_test exclusive2-2.8 {
#
db close
-db2 close
catch {close $::fd}
file delete -force test.db
file delete -force test.db-journal
@@ -255,50 +267,51 @@ do_test exclusive2-3.0 {
execsql {
BEGIN;
CREATE TABLE t1(a UNIQUE);
- INSERT INTO t1 VALUES(randstr(10, 400));
- INSERT INTO t1 VALUES(randstr(10, 400));
+ INSERT INTO t1 VALUES(randstr(200, 200));
+ INSERT INTO t1 VALUES(randstr(200, 200));
COMMIT;
}
readPagerChangeCounter test.db
} {1}
do_test exclusive2-3.1 {
execsql {
- INSERT INTO t1 VALUES(randstr(10, 400));
+ INSERT INTO t1 VALUES(randstr(200, 200));
}
readPagerChangeCounter test.db
} {2}
do_test exclusive2-3.2 {
execsql {
- INSERT INTO t1 VALUES(randstr(10, 400));
+ INSERT INTO t1 VALUES(randstr(200, 200));
}
readPagerChangeCounter test.db
} {3}
do_test exclusive2-3.3 {
execsql {
PRAGMA locking_mode = exclusive;
- INSERT INTO t1 VALUES(randstr(10, 400));
+ INSERT INTO t1 VALUES(randstr(200, 200));
}
readPagerChangeCounter test.db
} {4}
do_test exclusive2-3.4 {
+breakpoint
execsql {
- INSERT INTO t1 VALUES(randstr(10, 400));
+ INSERT INTO t1 VALUES(randstr(200, 200));
}
readPagerChangeCounter test.db
} {4}
do_test exclusive2-3.5 {
execsql {
PRAGMA locking_mode = normal;
- INSERT INTO t1 VALUES(randstr(10, 400));
+ INSERT INTO t1 VALUES(randstr(200, 200));
}
readPagerChangeCounter test.db
} {4}
do_test exclusive2-3.6 {
execsql {
- INSERT INTO t1 VALUES(randstr(10, 400));
+ INSERT INTO t1 VALUES(randstr(200, 200));
}
readPagerChangeCounter test.db
} {5}
-sqlite3_soft_heap_limit $soft_limit
+sqlite3_soft_heap_limit $cmdlinearg(soft-heap-limit)
finish_test
« no previous file with comments | « third_party/sqlite/src/test/exclusive.test ('k') | third_party/sqlite/src/test/exists.test » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698