From: dan <dan@noemail.net>
Date: Tue, 26 May 2015 14:57:45 +0000 (+0000)
Subject: Update test cases in corruptI.test so that they work with both SQLITE_ENABLE_OVERSIZE... 
X-Git-Tag: version-3.8.11~213
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6c1944f659151bdf21be8ebc72bc46c494987f1f;p=thirdparty%2Fsqlite.git

Update test cases in corruptI.test so that they work with both SQLITE_ENABLE_OVERSIZE_CELL_CHECK and SQLITE_DEFAULT_AUTOVACUUM builds.

FossilOrigin-Name: 22a14663782312fa7f4f18545509ef4b27e9b8c1
---

diff --git a/manifest b/manifest
index 09e0ae0033..df979e8665 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Return\sSQLITE_CORRUPT\sto\sthe\suser\sif\san\sattempt\sis\smade\sto\sadd\sdatabase\spage\s1\sto\sthe\sfree\spage\slist.
-D 2015-05-26T12:18:17.385
+C Update\stest\scases\sin\scorruptI.test\sso\sthat\sthey\swork\swith\sboth\sSQLITE_ENABLE_OVERSIZE_CELL_CHECK\sand\sSQLITE_DEFAULT_AUTOVACUUM\sbuilds.
+D 2015-05-26T14:57:45.716
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 69b596e4be75a16f4e55587f29db66497b207fad
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -452,7 +452,7 @@ F test/corruptE.test 193b4ca4e927e77c1d5f4f56203ddc998432a7ee
 F test/corruptF.test be9fde98e4c93648f1ba52b74e5318edc8f59fe4
 F test/corruptG.test 1ab3bf97ee7bdba70e0ff3ba2320657df55d1804
 F test/corruptH.test 5dd4fa98c6c1ed33b178f9e8a48c4fdd3cfc9067
-F test/corruptI.test 61e2a589a201b1de4fef59919a13a8458c3bedd0
+F test/corruptI.test ddf8c7146db0bc6080eedced67453b4cc69b5340
 F test/corruptJ.test 9e29e7a81ee3b6ac50f77ea7a9e2f3fa03f32d91
 F test/cost.test 19d314526616ce4473eb4e4e450fcb94499ce318
 F test/count.test cb2e0f934c6eb33670044520748d2ecccd46259c
@@ -1279,7 +1279,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 3b936913f3dc2cae4c94f983f28d85b136a44c9f
-R ee2ee5750218792d20f6412854d02033
+P 68876003f922635737349f55bc73a78891ea7028
+R 70e937d03a4979d1a7a8b4f6de706ca8
 U dan
-Z e4cd6153fb333675a2ebeb7e8f1f1bce
+Z 68736d8ef2ff1b67c68f4886c45044a4
diff --git a/manifest.uuid b/manifest.uuid
index dfc5013805..d19d23dc51 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-68876003f922635737349f55bc73a78891ea7028
\ No newline at end of file
+22a14663782312fa7f4f18545509ef4b27e9b8c1
\ No newline at end of file
diff --git a/test/corruptI.test b/test/corruptI.test
index df4a6341a7..2d4a481c77 100644
--- a/test/corruptI.test
+++ b/test/corruptI.test
@@ -123,13 +123,18 @@ do_execsql_test 4.0 {
 set root [db one {SELECT rootpage FROM sqlite_master}]
 set offset [expr ($root-1) * 65536]
 
+ifcapable oversize_cell_check {
+  set res {1 {database disk image is malformed}}
+} else {
+  set res {0 {}}
+}
 do_test 4.1 {
   db close
   hexio_write test.db [expr $offset + 8 + 2] 0000
   hexio_write test.db [expr $offset + 5] 0000
   sqlite3 db test.db
-  execsql { DELETE FROM t1 WHERE a=0 }
-} {}
+  catchsql { DELETE FROM t1 WHERE a=0 }
+} $res
 
 
 #-------------------------------------------------------------------------
@@ -192,6 +197,7 @@ do_test 5.3 {
 reset_db
 do_execsql_test 6.0 {
   PRAGMA page_size = 512;
+  PRAGMA auto_vacuum=0;
   CREATE TABLE t1(x);
   INSERT INTO t1 VALUES(zeroblob(300));
   INSERT INTO t1 VALUES(zeroblob(600));
@@ -210,6 +216,7 @@ do_test 6.1 {
 #
 reset_db
 do_execsql_test 7.0 {
+  PRAGMA auto_vacuum=0;
   CREATE TABLE t1(x PRIMARY KEY, y);
   INSERT INTO t1 VALUES('a', 'A');
   INSERT INTO t1 VALUES('b', 'A');
@@ -231,6 +238,7 @@ do_test 7.2 {
 #
 reset_db
 do_execsql_test 8.0 {
+  PRAGMA auto_vacuum=0;
   CREATE TABLE t1(x);
   INSERT INTO t1 VALUES(zeroblob(300));
   INSERT INTO t1 VALUES(zeroblob(300));