From: dan <dan@noemail.net>
Date: Tue, 1 Mar 2016 16:56:26 +0000 (+0000)
Subject: Do not attempt to run fts5bigtok.test or fts5merge2.test if FTS5 is not compiled in.
X-Git-Tag: version-3.11.1~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bce50c734b937a9756793c46b4f6db832b381036;p=thirdparty%2Fsqlite.git

Do not attempt to run fts5bigtok.test or fts5merge2.test if FTS5 is not compiled in.

FossilOrigin-Name: f7ed373953c2dea0919a85dfb461dfef512cd5fc
---

diff --git a/ext/fts5/test/fts5_common.tcl b/ext/fts5/test/fts5_common.tcl
index cf688dcc0d..93a8bab806 100644
--- a/ext/fts5/test/fts5_common.tcl
+++ b/ext/fts5/test/fts5_common.tcl
@@ -16,7 +16,10 @@ if {![info exists testdir]} {
 source $testdir/tester.tcl
 
 ifcapable !fts5 {
-  finish_test
+  proc return_if_no_fts5 {} {
+    finish_test
+    return -code return
+  }
   return
 }
 
@@ -25,12 +28,6 @@ catch {
   reset_db
 }
 
-# If SQLITE_ENABLE_FTS5 is not defined, skip this test.
-ifcapable !fts5 {
-  finish_test
-  return
-}
-
 proc fts5_test_poslist {cmd} {
   set res [list]
   for {set i 0} {$i < [$cmd xInstCount]} {incr i} {
diff --git a/ext/fts5/test/fts5bigtok.test b/ext/fts5/test/fts5bigtok.test
index 2267be5058..9ccaf6c860 100644
--- a/ext/fts5/test/fts5bigtok.test
+++ b/ext/fts5/test/fts5bigtok.test
@@ -14,6 +14,7 @@
 
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5bigtok
+return_if_no_fts5
 
 proc rndterm {} {
   set L [list a b c d e f g h i j k l m n o p q r s t u v w x y z]
diff --git a/ext/fts5/test/fts5merge2.test b/ext/fts5/test/fts5merge2.test
index 87dbf14332..cd515cc29e 100644
--- a/ext/fts5/test/fts5merge2.test
+++ b/ext/fts5/test/fts5merge2.test
@@ -13,7 +13,8 @@
 #
 
 source [file join [file dirname [info script]] fts5_common.tcl]
-set testprefix fts5merge
+set testprefix fts5merge2
+return_if_no_fts5
 
 proc dump_structure {} {
   db eval {SELECT fts5_decode(id, block) AS t FROM t1_data WHERE id=10} {
diff --git a/manifest b/manifest
index deaacdfcf2..9293374902 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\s-DSQLITE_ENABLE_FTS5\sto\sone\sof\sthe\srelease-test\sconfigurations\sin\sreleasetest.tcl.\sRun\sfts5\stests\sas\spart\sof\s"make\stest"\sif\sSQLITE_ENABLE_FTS5\sis\sdefined.
-D 2016-03-01T16:02:57.526
+C Do\snot\sattempt\sto\srun\sfts5bigtok.test\sor\sfts5merge2.test\sif\sFTS5\sis\snot\scompiled\sin.
+D 2016-03-01T16:56:26.421
 F Makefile.in 4e90dc1521879022aa9479268a4cd141d1771142
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 56ea123a975690bf9ed38b31bb89ff87b02a7c2b
@@ -116,7 +116,7 @@ F ext/fts5/fts5_varint.c a5aceacda04dafcbae725413d7a16818ecd65738
 F ext/fts5/fts5_vocab.c dba72ca393d71c2588548b51380387f6b44c77a8
 F ext/fts5/fts5parse.y 59432ea369f1aa65511bad465f55d31a22f9f223
 F ext/fts5/mkportersteps.tcl 5acf962d2e0074f701620bb5308155fa1e4a63ba
-F ext/fts5/test/fts5_common.tcl 61ff0d1a29d98a91c4553b20b3f410d858834ee9
+F ext/fts5/test/fts5_common.tcl fbbf457b1433151789a006f9f94c00780a5e3f78
 F ext/fts5/test/fts5aa.test 7e814df4a0e6c22a6fe2d84f210fdc0b5068a084
 F ext/fts5/test/fts5ab.test 30325a89453280160106be411bba3acf138e6d1b
 F ext/fts5/test/fts5ac.test 55cad4275a1f5acabfe14d8442a8046b47e49e5f
@@ -134,7 +134,7 @@ F ext/fts5/test/fts5auto.test 401c20e89f1114d733b94809be1e6f893e16c09e
 F ext/fts5/test/fts5aux.test 8c687c948cc98e9a94be014df7d518acc1b3b74f
 F ext/fts5/test/fts5auxdata.test 141a7cbffcceb1bd2799b4b29c183ff8780d586e
 F ext/fts5/test/fts5bigpl.test 04ee0d7eebbebf17c31f5a0b5c5f9494eac3a0cb
-F ext/fts5/test/fts5bigtok.test 981b2790f6fa02773c889bd35d42c6b97f80f0f4
+F ext/fts5/test/fts5bigtok.test 017a9397b14e7598883a6328ead4a6539b42d59a
 F ext/fts5/test/fts5columnsize.test a8cfef21ffa1c264b9f670a7d94eeaccb5341c07
 F ext/fts5/test/fts5config.test 8b2bc6dcc0eb06fa2b7dd65b2ce2db09e829e873
 F ext/fts5/test/fts5conflict.test 26f4e46c4d31e16221794832a990dc4e30e18de5
@@ -162,7 +162,7 @@ F ext/fts5/test/fts5hash.test 06f9309ccb4d5050a131594e9e47d0b21456837d
 F ext/fts5/test/fts5integrity.test f5e4f8d284385875068ad0f3e894ce43e9de835d
 F ext/fts5/test/fts5matchinfo.test 86569026d20f1ed748236587ce798de8a96615f1
 F ext/fts5/test/fts5merge.test 8f3cdba2ec9c5e7e568246e81b700ad37f764367
-F ext/fts5/test/fts5merge2.test c0cb66eb38a41c26cc5848fb9e50093e0f59ac93
+F ext/fts5/test/fts5merge2.test 8faa829aa3238a25a200200b54780a9bd5d97c14
 F ext/fts5/test/fts5near.test b214cddb1c1f1bddf45c75af768f20145f7e71cc
 F ext/fts5/test/fts5onepass.test 7ed9608e258132cb8d55e7c479b08676ad68810c
 F ext/fts5/test/fts5optimize.test 42741e7c085ee0a1276140a752d4407d97c2c9f5
@@ -1427,7 +1427,7 @@ F tool/vdbe_profile.tcl 246d0da094856d72d2c12efec03250d71639d19f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh ef6ebc6fd8d2dc35db3b622015c16a023d4fef4f
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 61927c8f3156c6e61b768318b3cd3bcc4144e17b
-R bfee7792832173f4b2f2e0f85f5783ce
+P 3cee93716f2aece03bf9b835fb7b5294e4ddc176
+R ea05f03539d26243966fe5b0665aa396
 U dan
-Z d07cc313679c906c74090dbeca08d604
+Z 26014b2cea95bca862f77aab9147f990
diff --git a/manifest.uuid b/manifest.uuid
index 065199ced8..670de7851f 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-3cee93716f2aece03bf9b835fb7b5294e4ddc176
\ No newline at end of file
+f7ed373953c2dea0919a85dfb461dfef512cd5fc
\ No newline at end of file