Disable new test modules nockpt.test and interrupt2.test for incompatible

permutations.  Add a CORRUPT_DB term to an assert() in vdbe.c.

FossilOrigin-Name: a54e619e6f0266932c8873f9ac826fd042a0602f

diff --git a/manifest b/manifest
index 5efd5be1042a8021e6da3e35a50e5f5ef5a8d85a..ad2045355434263dc568d2a03455bde4d4de3248 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Avoid\sa\spotential\s(harmless)\ssigned\sinteger\soverflow\sin\smemory\susage\naccounting\swhen\scalling\ssqlite3_realloc()\sto\sreduce\sthe\ssize\sof\san\nallocation.
-D 2016-12-27T12:08:36.304
+C Disable\snew\stest\smodules\snockpt.test\sand\sinterrupt2.test\sfor\sincompatible\npermutations.\s\sAdd\sa\sCORRUPT_DB\sterm\sto\san\sassert()\sin\svdbe.c.
+D 2016-12-27T12:35:36.977
 F Makefile.in 41bd4cad981487345c4a84081074bcdb876e4b2e
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc b8ca53350ae545e3562403d5da2a69cec79308da
@@ -455,7 +455,7 @@ F src/update.c 1da7c462110bffed442a42884cb0d528c1db46d8
 F src/utf.c 699001c79f28e48e9bcdf8a463da029ea660540c
 F src/util.c 1534060bc034cdc51381c040c8bd6252dbcb64c9
 F src/vacuum.c 33c174b28886b2faf26e503b5a49a1c01a9b1c16
-F src/vdbe.c 73ded9a61658c82cf726cb7feb070836cb4f8a87
+F src/vdbe.c a35ad51713d9be42f97e80f24cd4be5d20886a0c
 F src/vdbe.h 50ee139f9c68fff91be1d717ed3a6abbd496919c
 F src/vdbeInt.h 281cb70332dc8b593b8c7afe776f3a2ba7d4255e
 F src/vdbeapi.c d6ebaa465f070eb1af8ba4e7b34583ece87bdd24
@@ -869,7 +869,7 @@ F test/instr.test 737bbf80685232033f3abedc6ae92f75860b5dd2
 F test/instrfault.test aa90b7c3486a069151b28384ae525644a1f79d51
 F test/intarray.test 46d95b457916638c5d8b1af21fb174804b3acf8b
 F test/interrupt.test 16ea879ec728cb76414c148c5f24afd5d1f91054
-F test/interrupt2.test 829b06f9e20a6c378d8bd121b26c337f4dfa36e5
+F test/interrupt2.test e4408ca770a6feafbadb0801e54a0dcd1a8d108d
 F test/intpkey.test ac71107a49a06492b69b82aafaf225400598d3c8
 F test/io.test f95bca1783b01ea7761671560d023360d2dfa4cc
 F test/ioerr.test 2a24bd6ed5a8b062e64bfe1f6cf94fb25e92210d
@@ -967,7 +967,7 @@ F test/multiplex4.test e8ae4c4bd70606a5727743241f13b5701990abe4
 F test/mutex1.test ea2cc74d97f077b9e74c84cbd024f14d79a8126f
 F test/mutex2.test bfeaeac2e73095b2ac32285d2756e3a65e681660
 F test/nan.test dacc57f80859c06a433d30839336fe227d2038b3
-F test/nockpt.test 1e5c87614d200585b4395286946cca5fc0930e3f
+F test/nockpt.test 9f56a64b20fc78d278fa350a2271c1569d59cd7e
 F test/nolock.test f196cf8b8fbea4e2ca345140a2b3f3b0da45c76e
 F test/notify1.test 669b2b743618efdc18ca4b02f45423d5d2304abf
 F test/notify2.test 2ecabaa1305083856b7c39cf32816b612740c161
@@ -1539,7 +1539,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 382eea36c56f866efee1321f643687a4061e8b9e
-R 93ac45881220ef048be2df84ae58f915
+P 2d71cbdf6bc24f0269027c70b39ea7f342436bdb
+R 489b2a3e1a6fc86f485ef85f303a7517
 U drh
-Z 198951405d8d4aa948aae7ef07798be3
+Z 1382d3dd489de9084fb45c97add8c7aa

diff --git a/manifest.uuid b/manifest.uuid
index 28b15c57b0f687290e21e995001124240761d234..28eb1d9dffdd6626a790774fa85193d435147903 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2d71cbdf6bc24f0269027c70b39ea7f342436bdb
\ No newline at end of file
+a54e619e6f0266932c8873f9ac826fd042a0602f
\ No newline at end of file

diff --git a/src/vdbe.c b/src/vdbe.c
index ec722691f157d6a423ad7832b66ba8ce60ce20c9..152a37447aebcedd80e28f1270a5308d4d78ea26 100644 (file)
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -3783,7 +3783,8 @@ case OP_SeekGT: {       /* jump, in3 */
 
   if( pC->isTable ){
     /* The BTREE_SEEK_EQ flag is only set on index cursors */
-    assert( sqlite3BtreeCursorHasHint(pC->uc.pCursor, BTREE_SEEK_EQ)==0 );
+    assert( sqlite3BtreeCursorHasHint(pC->uc.pCursor, BTREE_SEEK_EQ)==0
+              || CORRUPT_DB );
 
     /* The input value in P3 might be of any type: integer, real, string,
     ** blob, or NULL.  But it needs to be an integer before we can do

diff --git a/test/interrupt2.test b/test/interrupt2.test
index 59ad7b389383ec647a3b4b236b97dee11d4ffff6..b9c66bd1f4c1aa06e7127e5c5c1fc3d605023ecc 100644 (file)
--- a/test/interrupt2.test
+++ b/test/interrupt2.test
@@ -18,6 +18,11 @@ source $testdir/tester.tcl
 source $testdir/wal_common.tcl
 set testprefix interrupt2
 
+if {[permutation]=="journaltest" || [permutation]=="inmemory_journal"} {
+  finish_test
+  return
+}
+
 db close
 testvfs tvfs -default 1
 

diff --git a/test/nockpt.test b/test/nockpt.test
index 6ac434ed5694cf014220e7a0bf662f128d952a12..60d687d99f84245a2779fed0e3f480a8237f7064 100644 (file)
--- a/test/nockpt.test
+++ b/test/nockpt.test
@@ -19,6 +19,7 @@ source $testdir/lock_common.tcl
 source $testdir/malloc_common.tcl
 source $testdir/wal_common.tcl
 ifcapable !wal {finish_test ; return }
+if {[permutation]=="journaltest"} {finish_test; return}
 
 set testprefix nockpt