From: dan <dan@noemail.net>
Date: Sat, 13 Apr 2019 16:35:02 +0000 (+0000)
Subject: Fix a test script problem in fts5corrupt3.test.
X-Git-Tag: version-3.28.0~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=de21ad704a15098f33b213ce37680f975eea67d5;p=thirdparty%2Fsqlite.git

Fix a test script problem in fts5corrupt3.test.

FossilOrigin-Name: 858f62274eb727109d0452ad2d80c0e0acab0f569494b1218c404501e103ed39
---

diff --git a/ext/fts5/test/fts5corrupt3.test b/ext/fts5/test/fts5corrupt3.test
index 15cd003fe5..d5138660b2 100644
--- a/ext/fts5/test/fts5corrupt3.test
+++ b/ext/fts5/test/fts5corrupt3.test
@@ -7994,9 +7994,19 @@ do_test 56.0 {
 | end crash-2acc487d09f033.db
 }]} {}
 
-do_catchsql_test 56.1 {
-  INSERT INTO t1(b) VALUES(randomblob(250));
-  INSERT INTO t1(b) VALUES(randomblob(250));
+do_test 56.1 {
+  set res [catchsql {
+    INSERT INTO t1(b) VALUES(randomblob(250));
+    INSERT INTO t1(b) VALUES(randomblob(250));
+  }]
+
+  # For some permutations - those that use the page-cache - this test
+  # may return SQLITE_CONSTRAINT instead of SQLITE_CORRUPT. This is because
+  # the corrupt db in the test over-reads the page buffer slightly, with
+  # different results depending on whether or not the page-cache is in use.
+  if {$res=="1 {constraint failed}"} {
+    set res "1 {database disk image is malformed}"
+  }
 } {1 {database disk image is malformed}}
 
 #-------------------------------------------------------------------------
diff --git a/manifest b/manifest
index 5302c50dec..b47d7c1d81 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Partially\srevert\sthe\stest\sfile\schanges\sin\s[4371a0c46e].\sIt\sis\sno\slonger\srequired\sfollowing\s[93ae382e97c23c90].
-D 2019-04-13T15:07:00.593
+C Fix\sa\stest\sscript\sproblem\sin\sfts5corrupt3.test.
+D 2019-04-13T16:35:02.509
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -157,7 +157,7 @@ F ext/fts5/test/fts5connect.test 08030168fc96fc278fa81f28654fb7e90566f33aff269c0
 F ext/fts5/test/fts5content.test 688d5ac7af194ebc67495daea76a69e3cd5480122c2320e72d41241b423b4116
 F ext/fts5/test/fts5corrupt.test 77ae6f41a7eba10620efb921cf7dbe218b0ef232b04519deb43581cb17a57ebe
 F ext/fts5/test/fts5corrupt2.test 7453752ba12ce91690c469a6449d412561cc604b1dec994e16ab132952e7805f
-F ext/fts5/test/fts5corrupt3.test db13dbca9cf4cb68d4705344baea002310a8ff2252adc55fd1de217ca1e93747
+F ext/fts5/test/fts5corrupt3.test a5bca4302f907100501d88cf878196bbfebbec40e727760df152551754effbec
 F ext/fts5/test/fts5delete.test cbf87e3b8867c4d5cfcaed975c7475fd3f99d072bce2075fcedf43d1f82af775
 F ext/fts5/test/fts5detail.test 31b240dbf6d44ac3507e2f8b65f29fdc12465ffd531212378c7ce1066766f54e
 F ext/fts5/test/fts5determin.test 1b77879b2ae818b5b71c859e534ee334dac088b7cf3ff3bf76a2c82b1c788d11
@@ -1818,7 +1818,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 6fc0deffa4eed902fd13eefe6d2765f338f3dadc5b29f7cae5064e135417746b
-R e2acbab458283cdaffd67b36fa814ee1
+P 593a7e6e20a2f91fe3497edd7effad50ac876f7f03c9222e332dfeb43d26882e
+R a313753b410309d2097004d21b05b25d
 U dan
-Z 80d126619dd8bbe4e3a09aa21f560fbe
+Z 30db34d1513c82db3572cc241354fd26
diff --git a/manifest.uuid b/manifest.uuid
index a657eeb665..fd6d560e5f 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-593a7e6e20a2f91fe3497edd7effad50ac876f7f03c9222e332dfeb43d26882e
\ No newline at end of file
+858f62274eb727109d0452ad2d80c0e0acab0f569494b1218c404501e103ed39
\ No newline at end of file