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

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

Issue 2751253002: [sql] Import SQLite 3.17.0. (Closed)
Patch Set: also clang on Linux i386 Created 3 years, 9 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/subselect.test ('k') | third_party/sqlite/src/test/symlink.test » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/sqlite/src/test/superlock.test
diff --git a/third_party/sqlite/src/test/superlock.test b/third_party/sqlite/src/test/superlock.test
index 8199d5218df53c66388fa8ee6b4ba600cd124194..704b0677a144b8b5dd1745a3f25d138c68097c16 100644
--- a/third_party/sqlite/src/test/superlock.test
+++ b/third_party/sqlite/src/test/superlock.test
@@ -15,6 +15,7 @@ source $testdir/tester.tcl
source $testdir/lock_common.tcl
set testprefix superlock
+do_not_use_codec
# Test organization:
#
@@ -238,13 +239,23 @@ db_swap test.db2 test.db
do_catchsql_test 6.9 { SELECT * FROM t1 } {0 {1 2 3 4}}
do_catchsql_test 6.10 { SELECT * FROM t2 } {1 {no such table: t2}}
-do_execsql_test 6.11 {
- PRAGMA journal_mode = delete;
- PRAGMA page_size = 512;
- VACUUM;
- PRAGMA journal_mode = wal;
- INSERT INTO t1 VALUES(5, 6);
-} {delete wal}
+if {[nonzero_reserved_bytes]} {
+ # Vacuum with a size change is not allowed with the codec
+ do_execsql_test 6.11codec {
+ PRAGMA journal_mode = delete;
+ VACUUM;
+ PRAGMA journal_mode = wal;
+ INSERT INTO t1 VALUES(5, 6);
+ } {delete wal}
+} else {
+ do_execsql_test 6.11 {
+ PRAGMA journal_mode = delete;
+ PRAGMA page_size = 512;
+ VACUUM;
+ PRAGMA journal_mode = wal;
+ INSERT INTO t1 VALUES(5, 6);
+ } {delete wal}
+}
db_swap test.db2 test.db
do_catchsql_test 6.12 { SELECT * FROM t1 } {1 {no such table: t1}}
« no previous file with comments | « third_party/sqlite/src/test/subselect.test ('k') | third_party/sqlite/src/test/symlink.test » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698