Fix Makefile.in to account for recent changes. Update fts5 test scripts so that they...

FossilOrigin-Name: 3175220747f5d4dadd17e09fb1899dc782c90926

diff --git a/Makefile.in b/Makefile.in
index a4c585c7cd87230c4c94121bee345f63a04fd213..0a2389225b5a087f1479388b1761230b6c37583e 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -173,6 +173,7 @@ LIBOBJS0 = alter.lo analyze.lo attach.lo auth.lo \
          fts3_porter.lo fts3_snippet.lo fts3_tokenizer.lo fts3_tokenizer1.lo \
          fts3_tokenize_vtab.lo \
          fts3_unicode.lo fts3_unicode2.lo fts3_write.lo \
+        fts5.lo \
          func.lo global.lo hash.lo \
          icu.lo insert.lo journal.lo legacy.lo loadext.lo \
          main.lo malloc.lo mem0.lo mem1.lo mem2.lo mem3.lo mem5.lo \
@@ -347,22 +348,6 @@ SRC += \
   $(TOP)/ext/ota/sqlite3ota.h \
   $(TOP)/ext/ota/sqlite3ota.c
 
-SRC += \
-   $(TOP)/ext/fts5/fts5.h \
-   $(TOP)/ext/fts5/fts5Int.h \
-   $(TOP)/ext/fts5/fts5_aux.c \
-   $(TOP)/ext/fts5/fts5_buffer.c \
-   $(TOP)/ext/fts5/fts5_main.c \
-   $(TOP)/ext/fts5/fts5_config.c \
-   $(TOP)/ext/fts5/fts5_expr.c \
-   $(TOP)/ext/fts5/fts5_hash.c \
-   $(TOP)/ext/fts5/fts5_index.c \
-   fts5parse.c fts5parse.h \
-   $(TOP)/ext/fts5/fts5_storage.c \
-   $(TOP)/ext/fts5/fts5_tokenize.c \
-   $(TOP)/ext/fts5/fts5_unicode2.c \
-   $(TOP)/ext/fts5/fts5_vocab.c 
-
 
 # Generated source code files
 #
@@ -429,6 +414,7 @@ TESTSRC += \
   $(TOP)/ext/misc/eval.c \
   $(TOP)/ext/misc/fileio.c \
   $(TOP)/ext/misc/fuzzer.c \
+  $(TOP)/ext/fts5/fts5_tcl.c \
   $(TOP)/ext/misc/ieee754.c \
   $(TOP)/ext/misc/nextchar.c \
   $(TOP)/ext/misc/percentile.c \
@@ -990,6 +976,25 @@ fts3_write.lo:     $(TOP)/ext/fts3/fts3_write.c $(HDR) $(EXTHDR)
 rtree.lo:      $(TOP)/ext/rtree/rtree.c $(HDR) $(EXTHDR)
        $(LTCOMPILE) -DSQLITE_CORE -c $(TOP)/ext/rtree/rtree.c
 
+# FTS5 things
+#
+FTS5_SRC = \
+   $(TOP)/ext/fts5/fts5.h \
+   $(TOP)/ext/fts5/fts5Int.h \
+   $(TOP)/ext/fts5/fts5_aux.c \
+   $(TOP)/ext/fts5/fts5_buffer.c \
+   $(TOP)/ext/fts5/fts5_main.c \
+   $(TOP)/ext/fts5/fts5_config.c \
+   $(TOP)/ext/fts5/fts5_expr.c \
+   $(TOP)/ext/fts5/fts5_hash.c \
+   $(TOP)/ext/fts5/fts5_index.c \
+   fts5parse.c fts5parse.h \
+   $(TOP)/ext/fts5/fts5_storage.c \
+   $(TOP)/ext/fts5/fts5_tokenize.c \
+   $(TOP)/ext/fts5/fts5_unicode2.c \
+   $(TOP)/ext/fts5/fts5_varint.c \
+   $(TOP)/ext/fts5/fts5_vocab.c  \
+
 fts5parse.c:   $(TOP)/ext/fts5/fts5parse.y lemon 
        cp $(TOP)/ext/fts5/fts5parse.y .
        rm -f fts5parse.h
@@ -1002,6 +1007,12 @@ fts5parse.c:     $(TOP)/ext/fts5/fts5parse.y lemon
 
 fts5parse.h: fts5parse.c
 
+fts5.c: $(FTS5_SRC)
+       $(TCLSH_CMD) $(TOP)/ext/fts5/tool/mkfts5c.tcl
+
+fts5.lo:       fts5.c $(HDR) $(EXTHDR)
+       $(LTCOMPILE) -DSQLITE_CORE -c fts5.c
+
 
 # Rules to build the 'testfixture' application.
 #

diff --git a/ext/fts5/test/fts5_common.tcl b/ext/fts5/test/fts5_common.tcl
index 06309e2163dae30b74ff088337a6705b6c3ce08c..ddc8060ecc12a71cb670a2ee02c84acf03aa471d 100644 (file)
--- a/ext/fts5/test/fts5_common.tcl
+++ b/ext/fts5/test/fts5_common.tcl
@@ -15,6 +15,7 @@ if {![info exists testdir]} {
 }
 source $testdir/tester.tcl
 
+
 catch { sqlite3_fts5_may_be_corrupt 0 }
 
 proc fts5_test_poslist {cmd} {

diff --git a/ext/fts5/test/fts5alter.test b/ext/fts5/test/fts5alter.test
index f2000ff1dc592ca89e7751c2b97afe35b8740abe..0ed788b8a94cebea51a85f9caf0f8c1027a18cd7 100644 (file)
--- a/ext/fts5/test/fts5alter.test
+++ b/ext/fts5/test/fts5alter.test
@@ -16,6 +16,11 @@
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5alter
 
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
+ifcapable !fts5 {
+  finish_test
+  return
+}
 
 #-------------------------------------------------------------------------
 # Test renaming regular, contentless and columnsize=0 FTS5 tables.

diff --git a/ext/fts5/test/fts5aux.test b/ext/fts5/test/fts5aux.test
index bbb6cf81f1ef2e8177c7f9c93b180d4a3fc0fb6e..995fe857845e1715f07e4fddca5222119a4d9a43 100644 (file)
--- a/ext/fts5/test/fts5aux.test
+++ b/ext/fts5/test/fts5aux.test
@@ -15,6 +15,12 @@
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5aux
 
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
+ifcapable !fts5 {
+  finish_test
+  return
+}
+
 proc inst {cmd i} { 
   $cmd xInst $i
 }

diff --git a/ext/fts5/test/fts5auxdata.test b/ext/fts5/test/fts5auxdata.test
index ee408a06458fdfab7377c314af09618a9b497d22..dbbb1dba7852bde051e2c2a6300db4c5659d9ca5 100644 (file)
--- a/ext/fts5/test/fts5auxdata.test
+++ b/ext/fts5/test/fts5auxdata.test
@@ -15,6 +15,12 @@
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5auxdata
 
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
+ifcapable !fts5 {
+  finish_test
+  return
+}
+
 do_execsql_test 1.0 {
   CREATE VIRTUAL TABLE f1 USING fts5(a, b);
   INSERT INTO f1(rowid, a, b) VALUES(1, 'a', 'b1');

diff --git a/ext/fts5/test/fts5bigpl.test b/ext/fts5/test/fts5bigpl.test
index 172c0396be4e0181d3f6aaafb00a22809f527150..85f74606c65824a9dd534298f8f66db4b4427b1d 100644 (file)
--- a/ext/fts5/test/fts5bigpl.test
+++ b/ext/fts5/test/fts5bigpl.test
@@ -17,6 +17,12 @@
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5bigpl
 
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
+ifcapable !fts5 {
+  finish_test
+  return
+}
+
 if { $tcl_platform(wordSize)<8 } {
   finish_test
   return

diff --git a/ext/fts5/test/fts5columnsize.test b/ext/fts5/test/fts5columnsize.test
index 2e547707369996b7228f7652be5c201575ee3057..ed0edd677ec3e6936601881ccc56cfd405a77052 100644 (file)
--- a/ext/fts5/test/fts5columnsize.test
+++ b/ext/fts5/test/fts5columnsize.test
@@ -15,6 +15,12 @@
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5columnsize
 
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
+ifcapable !fts5 {
+  finish_test
+  return
+}
+
 #-------------------------------------------------------------------------
 # Check that the option can be parsed and that the %_docsize table is
 # only created if it is set to true.

diff --git a/ext/fts5/test/fts5config.test b/ext/fts5/test/fts5config.test
index 22e7631bc0360bc5ed1a2a3b42761b743d949d51..7c88e03d389f42b83ba2a7cbf8cb74337018e043 100644 (file)
--- a/ext/fts5/test/fts5config.test
+++ b/ext/fts5/test/fts5config.test
@@ -16,6 +16,12 @@
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5config
 
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
+ifcapable !fts5 {
+  finish_test
+  return
+}
+
 #-------------------------------------------------------------------------
 # Try different types of quote characters.
 #

diff --git a/ext/fts5/test/fts5content.test b/ext/fts5/test/fts5content.test
index 1b5b6b30723455200fe02f472e3cca7ac36c2bef..f87aa3d947ebc1188a988b61266efd7671fb4075 100644 (file)
--- a/ext/fts5/test/fts5content.test
+++ b/ext/fts5/test/fts5content.test
@@ -15,6 +15,12 @@
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5content
 
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
+ifcapable !fts5 {
+  finish_test
+  return
+}
+
 #-------------------------------------------------------------------------
 # Contentless tables
 #

diff --git a/ext/fts5/test/fts5corrupt.test b/ext/fts5/test/fts5corrupt.test
index efbe3f5d843785179aa5b15bc92eb156fad076cc..3f57eb515a523c8339667e2dc93b4ddf7ec386e2 100644 (file)
--- a/ext/fts5/test/fts5corrupt.test
+++ b/ext/fts5/test/fts5corrupt.test
@@ -16,6 +16,12 @@
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5corrupt
 
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
+ifcapable !fts5 {
+  finish_test
+  return
+}
+
 do_execsql_test 1.0 {
   CREATE VIRTUAL TABLE t1 USING fts5(x);
   INSERT INTO t1(t1, rank) VALUES('pgsz', 32);

diff --git a/ext/fts5/test/fts5corrupt2.test b/ext/fts5/test/fts5corrupt2.test
index 28486b34ac6bebc13d9fea2f5cbe5b6f9580a1d7..3e8323b984ee51682161847679c1fc16a56ef0cc 100644 (file)
--- a/ext/fts5/test/fts5corrupt2.test
+++ b/ext/fts5/test/fts5corrupt2.test
@@ -16,6 +16,12 @@
 
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5corrupt2
+
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
+ifcapable !fts5 {
+  finish_test
+  return
+}
 sqlite3_fts5_may_be_corrupt 1
 
 # Create a simple FTS5 table containing 100 documents. Each document 

diff --git a/ext/fts5/test/fts5corrupt3.test b/ext/fts5/test/fts5corrupt3.test
index 831eca54542f4be2d580c3c3a20a796b5b12d95d..cf08a5b1075afc6e7de5484efd53cda1c9e7f3c0 100644 (file)
--- a/ext/fts5/test/fts5corrupt3.test
+++ b/ext/fts5/test/fts5corrupt3.test
@@ -16,6 +16,12 @@
 
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5corrupt3
+
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
+ifcapable !fts5 {
+  finish_test
+  return
+}
 sqlite3_fts5_may_be_corrupt 1
 
 # Create a simple FTS5 table containing 100 documents. Each document 

diff --git a/ext/fts5/test/fts5dlidx.test b/ext/fts5/test/fts5dlidx.test
index 013de1b4a0fd91f5552844db706f80045d80832e..07d7e2baeb729cf32bc097034ea87c7850146887 100644 (file)
--- a/ext/fts5/test/fts5dlidx.test
+++ b/ext/fts5/test/fts5dlidx.test
@@ -15,6 +15,12 @@
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5dlidx
 
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
+ifcapable !fts5 {
+  finish_test
+  return
+}
+
 if { $tcl_platform(wordSize)<8 } {
   finish_test
   return

diff --git a/ext/fts5/test/fts5doclist.test b/ext/fts5/test/fts5doclist.test
index eb1dc9a6958ed35685cdaa90968173e07899bfe5..411289a5235ea7d60fc295d2d58e52d8def33ca0 100644 (file)
--- a/ext/fts5/test/fts5doclist.test
+++ b/ext/fts5/test/fts5doclist.test
@@ -15,6 +15,12 @@
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5doclist
 
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
+ifcapable !fts5 {
+  finish_test
+  return
+}
+
 
 #-------------------------------------------------------------------------
 # Create a table with 1000 columns. Then add some large documents to it.

diff --git a/ext/fts5/test/fts5full.test b/ext/fts5/test/fts5full.test
index 4563cedce53d250d33e914cbd2bc011cc86feb9d..c640f56e0651bcbec0729eb667fc925ac430a820 100644 (file)
--- a/ext/fts5/test/fts5full.test
+++ b/ext/fts5/test/fts5full.test
@@ -17,6 +17,12 @@
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5full
 
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
+ifcapable !fts5 {
+  finish_test
+  return
+}
+
 do_execsql_test 1.0 {
   CREATE VIRTUAL TABLE x8 USING fts5(i);
   INSERT INTO x8(x8, rank) VALUES('automerge', 0);

diff --git a/ext/fts5/test/fts5hash.test b/ext/fts5/test/fts5hash.test
index 1189ef53919d4734e357e49b96d9355ff921ccf3..a49fa2697d7fc94dba7bf30a2dd8db3f75100e03 100644 (file)
--- a/ext/fts5/test/fts5hash.test
+++ b/ext/fts5/test/fts5hash.test
@@ -15,6 +15,12 @@
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5hash
 
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
+ifcapable !fts5 {
+  finish_test
+  return
+}
+
 #-------------------------------------------------------------------------
 # Return a list of tokens (a vocabulary) that all share the same hash
 # key value. This can be used to test hash collisions.

diff --git a/ext/fts5/test/fts5integrity.test b/ext/fts5/test/fts5integrity.test
index 8f56e9273ea5d4bcc5d7a7b71682fdda555975bd..478e790d6b2d29748b09be2df72fbd283ba3f24b 100644 (file)
--- a/ext/fts5/test/fts5integrity.test
+++ b/ext/fts5/test/fts5integrity.test
@@ -15,6 +15,12 @@
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5integrity
 
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
+ifcapable !fts5 {
+  finish_test
+  return
+}
+
 do_execsql_test 1.0 {
   CREATE VIRTUAL TABLE xx USING fts5(x);
   INSERT INTO xx VALUES('term');

diff --git a/ext/fts5/test/fts5merge.test b/ext/fts5/test/fts5merge.test
index 023a2f7fe876113b1cb2367f3c301e5ab9600259..9dd1ecd026d88782610dfc9bc31db6d86a7f2ded 100644 (file)
--- a/ext/fts5/test/fts5merge.test
+++ b/ext/fts5/test/fts5merge.test
@@ -15,6 +15,12 @@
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5merge
 
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
+ifcapable !fts5 {
+  finish_test
+  return
+}
+
 db func repeat [list string repeat]
 
 #-------------------------------------------------------------------------

diff --git a/ext/fts5/test/fts5near.test b/ext/fts5/test/fts5near.test
index dffce294315d11fa5602259ab9b3cfe015c022fd..b4ae205deeb626de1f63dcce789be09672338c49 100644 (file)
--- a/ext/fts5/test/fts5near.test
+++ b/ext/fts5/test/fts5near.test
@@ -15,6 +15,12 @@
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5near
 
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
+ifcapable !fts5 {
+  finish_test
+  return
+}
+
 proc do_near_test {tn doc near res} {
   uplevel [list do_execsql_test $tn "
     DELETE FROM t1;

diff --git a/ext/fts5/test/fts5optimize.test b/ext/fts5/test/fts5optimize.test
index 068cf4c22584a1a06d9436de31df3ba0e36df2c7..984af8c532326b8a8cd57756a19f5e631e5cd208 100644 (file)
--- a/ext/fts5/test/fts5optimize.test
+++ b/ext/fts5/test/fts5optimize.test
@@ -14,6 +14,12 @@
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5optimize
 
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
+ifcapable !fts5 {
+  finish_test
+  return
+}
+
 proc rnddoc {nWord} {
   set vocab {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}
   set nVocab [llength $vocab]

diff --git a/ext/fts5/test/fts5plan.test b/ext/fts5/test/fts5plan.test
index 72fdc60de32a509e89b78985ff130f26a7bd1575..d7f5fd65a035d59c1e55757d670fcee5c2caa52d 100644 (file)
--- a/ext/fts5/test/fts5plan.test
+++ b/ext/fts5/test/fts5plan.test
@@ -15,6 +15,12 @@
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5plan
 
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
+ifcapable !fts5 {
+  finish_test
+  return
+}
+
 do_execsql_test 1.0 {
   CREATE TABLE t1(x, y);
   CREATE VIRTUAL TABLE f1 USING fts5(ff);

diff --git a/ext/fts5/test/fts5porter.test b/ext/fts5/test/fts5porter.test
index 83ca8523050d4f14f545b5e3fb814478e88a40af..2535eb75b1ee998ce2ef29f3edb689578831ca88 100644 (file)
--- a/ext/fts5/test/fts5porter.test
+++ b/ext/fts5/test/fts5porter.test
@@ -17,6 +17,12 @@
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5porter
 
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
+ifcapable !fts5 {
+  finish_test
+  return
+}
+
 set test_vocab {
   a               a               aaron           aaron          
   abaissiez       abaissiez       abandon         abandon        

diff --git a/ext/fts5/test/fts5porter2.test b/ext/fts5/test/fts5porter2.test
index 7ea2e6994d09829990c59b5097b09a92642b5ff2..5e0aeb029f21d397c66de19619fc11e6e520d572 100644 (file)
--- a/ext/fts5/test/fts5porter2.test
+++ b/ext/fts5/test/fts5porter2.test
@@ -18,6 +18,12 @@
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5porter2
 
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
+ifcapable !fts5 {
+  finish_test
+  return
+}
+
 set test_vocab {
   tion          tion
   ation         ation

diff --git a/ext/fts5/test/fts5prefix.test b/ext/fts5/test/fts5prefix.test
index c555080a276fdeec342e7342c413c1829c101755..076ecaa09bdb7fd3bacedf9f334b6e99b30e6b38 100644 (file)
--- a/ext/fts5/test/fts5prefix.test
+++ b/ext/fts5/test/fts5prefix.test
@@ -15,6 +15,12 @@
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5prefix
 
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
+ifcapable !fts5 {
+  finish_test
+  return
+}
+
 do_execsql_test 1.0 {
   CREATE VIRTUAL TABLE xx USING fts5(x, prefix=1);
   INSERT INTO xx VALUES('one two three');

diff --git a/ext/fts5/test/fts5rank.test b/ext/fts5/test/fts5rank.test
index 6da24adee2f9f7f2142d2b607b59cf851c088fe6..2182ab30976e6daed621bdb768133d89309ea5a7 100644 (file)
--- a/ext/fts5/test/fts5rank.test
+++ b/ext/fts5/test/fts5rank.test
@@ -15,6 +15,12 @@
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5rank
 
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
+ifcapable !fts5 {
+  finish_test
+  return
+}
+
 
 #-------------------------------------------------------------------------
 # "ORDER BY rank" + highlight() + large poslists.

diff --git a/ext/fts5/test/fts5rebuild.test b/ext/fts5/test/fts5rebuild.test
index 96961792f57e6d584aae9b03f37e3a64286bc321..1044421d5e5835a58be2b47218d0e734bb723983 100644 (file)
--- a/ext/fts5/test/fts5rebuild.test
+++ b/ext/fts5/test/fts5rebuild.test
@@ -14,6 +14,12 @@
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5rebuild
 
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
+ifcapable !fts5 {
+  finish_test
+  return
+}
+
 do_execsql_test 1.1 {
   CREATE VIRTUAL TABLE f1 USING fts5(a, b);
   INSERT INTO f1(a, b) VALUES('one',   'o n e');

diff --git a/ext/fts5/test/fts5restart.test b/ext/fts5/test/fts5restart.test
index 8fa3600ab3374affc286774507a2f6757a8b8ac2..0dd7d694540bdbea311a8aa493afbb193b4c2dbc 100644 (file)
--- a/ext/fts5/test/fts5restart.test
+++ b/ext/fts5/test/fts5restart.test
@@ -15,6 +15,12 @@
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5restart
 
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
+ifcapable !fts5 {
+  finish_test
+  return
+}
+
 do_execsql_test 1.0 {
   CREATE VIRTUAL TABLE f1 USING fts5(ff);
 }

diff --git a/ext/fts5/test/fts5rowid.test b/ext/fts5/test/fts5rowid.test
index 5d0253472d0754287b87c03cb0a00bcd578dc98c..9ea5272d5b52c379afdaa7a36b7c55ed349d299f 100644 (file)
--- a/ext/fts5/test/fts5rowid.test
+++ b/ext/fts5/test/fts5rowid.test
@@ -15,6 +15,12 @@
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5rowid
 
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
+ifcapable !fts5 {
+  finish_test
+  return
+}
+
 do_catchsql_test 1.1 {
   SELECT fts5_rowid()
 } {1 {should be: fts5_rowid(subject, ....)}}

diff --git a/ext/fts5/test/fts5tokenizer.test b/ext/fts5/test/fts5tokenizer.test
index 1a3d253be8ce25c41f988db0dbc4018d74ba5a38..0246419572e2f242979f3280ba5a718ffc339064 100644 (file)
--- a/ext/fts5/test/fts5tokenizer.test
+++ b/ext/fts5/test/fts5tokenizer.test
@@ -15,6 +15,12 @@
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5tokenizer
 
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
+ifcapable !fts5 {
+  finish_test
+  return
+}
+
 
 do_execsql_test 1.0 {
   CREATE VIRTUAL TABLE ft1 USING fts5(x, tokenize=porter);

diff --git a/ext/fts5/test/fts5unicode.test b/ext/fts5/test/fts5unicode.test
index 0018a4903016de129a2ded8fb852d50d4663b22c..46f4c4f1aaaaa429f37d9da4e1eee8b8f4ecb420 100644 (file)
--- a/ext/fts5/test/fts5unicode.test
+++ b/ext/fts5/test/fts5unicode.test
@@ -15,6 +15,12 @@
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5unicode
 
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
+ifcapable !fts5 {
+  finish_test
+  return
+}
+
 proc tokenize_test {tn tokenizer input output} {
   uplevel [list do_test $tn [subst -nocommands {
     set ret {}

diff --git a/ext/fts5/test/fts5unicode2.test b/ext/fts5/test/fts5unicode2.test
index 280d045db17517c3ccc352196d149e101757102b..e34bc840a59755e609880d7a10f3ac4771827daa 100644 (file)
--- a/ext/fts5/test/fts5unicode2.test
+++ b/ext/fts5/test/fts5unicode2.test
@@ -17,6 +17,12 @@
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5unicode2
 
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
+ifcapable !fts5 {
+  finish_test
+  return
+}
+
 proc do_unicode_token_test {tn input res} {
   uplevel [list do_test $tn [list \
     sqlite3_fts5_tokenize -subst db "unicode61 remove_diacritics 0" $input

diff --git a/ext/fts5/test/fts5unicode3.test b/ext/fts5/test/fts5unicode3.test
index a9efa4474ccd4234180ed3ff6bafebff68cd2829..876ad27461f323a071d6574b6120756fb0456d4a 100644 (file)
--- a/ext/fts5/test/fts5unicode3.test
+++ b/ext/fts5/test/fts5unicode3.test
@@ -12,11 +12,18 @@
 # Tests focusing on the fts5 tokenizers
 #
 
+source [file join [file dirname [info script]] fts5_common.tcl]
+
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
+ifcapable !fts5 {
+  finish_test
+  return
+}
+
 proc fts3_unicode_path {file} {
   file join [file dirname [info script]] .. .. fts3 unicode $file
 }
 
-source [file join [file dirname [info script]] fts5_common.tcl]
 source [fts3_unicode_path parseunicode.tcl]
 set testprefix fts5unicode3
 

diff --git a/ext/fts5/test/fts5unindexed.test b/ext/fts5/test/fts5unindexed.test
index e808064f0560df2c8402fd5f8ff47628b0fbdd49..16d43f84c2aaaeca3597b2d5d8a11d70ec22faea 100644 (file)
--- a/ext/fts5/test/fts5unindexed.test
+++ b/ext/fts5/test/fts5unindexed.test
@@ -15,6 +15,12 @@
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5unindexed
 
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
+ifcapable !fts5 {
+  finish_test
+  return
+}
+
 
 do_execsql_test 1.1 {
   CREATE VIRTUAL TABLE t1 USING fts5(a, b UNINDEXED);

diff --git a/ext/fts5/test/fts5version.test b/ext/fts5/test/fts5version.test
index ccd035ae4b3cf4d86d85cf16bd856ea7346ce85c..2176fee7d3640ddeaa1bcf287bdfb526c48cf58a 100644 (file)
--- a/ext/fts5/test/fts5version.test
+++ b/ext/fts5/test/fts5version.test
@@ -16,6 +16,12 @@
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5version
 
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
+ifcapable !fts5 {
+  finish_test
+  return
+}
+
 
 do_execsql_test 1.1 {
   CREATE VIRTUAL TABLE t1 USING fts5(one);

diff --git a/ext/fts5/test/fts5vocab.test b/ext/fts5/test/fts5vocab.test
index 2d2faac3e05ef26f2a0ee762b143fdefe19830e1..c95f50b8357e853801b00e2541dd368b516fc291 100644 (file)
--- a/ext/fts5/test/fts5vocab.test
+++ b/ext/fts5/test/fts5vocab.test
@@ -15,6 +15,12 @@
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5vocab
 
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
+ifcapable !fts5 {
+  finish_test
+  return
+}
+
 
 do_execsql_test 1.1.1 {
   CREATE VIRTUAL TABLE t1 USING fts5(one, prefix=1);

diff --git a/manifest b/manifest
index 42920706b3593586390c397f0225bf0b2299c3f0..81ca8a12d14ccd320bf876c38f9df85c9a60c11f 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,7 +1,7 @@
-C Merge\slatest\strunk\schanges\sinto\sthis\sbranch.
-D 2015-06-25T20:16:23.149
+C Fix\sMakefile.in\sto\saccount\sfor\srecent\schanges.\sUpdate\sfts5\stest\sscripts\sso\sthat\sthey\sdo\snot\srun\sif\sSQLITE_ENABLE_FTS5\sis\snot\sdefined.
+D 2015-06-25T20:36:36.724
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
-F Makefile.in 4757ec5c89c420d90f18b0afa6e63d7b884c881d
+F Makefile.in 285a0a234ed7610d431d91671c136098c2bd86a9
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 F Makefile.msc b7db9ccbbad1c495b98e5326a06cac03aa206127
 F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
@@ -122,7 +122,7 @@ F ext/fts5/fts5_varint.c 366452037bf9a000c351374b489badc1b3541796
 F ext/fts5/fts5_vocab.c e454fa58c6d591024659a9b61eece0d708e8b575
 F ext/fts5/fts5parse.y 833db1101b78c0c47686ab1b84918e38c36e9452
 F ext/fts5/mkportersteps.tcl 5acf962d2e0074f701620bb5308155fa1e4a63ba
-F ext/fts5/test/fts5_common.tcl 26bab0c0ed684e95cd93c419ed995a3f83f4c258
+F ext/fts5/test/fts5_common.tcl 407ab0852318cda22544834a09db7af265085ecb
 F ext/fts5/test/fts5aa.test 0be21c89fd66b588db355a6398911fd875bdcc6c
 F ext/fts5/test/fts5ab.test 6fe3a56731d15978afbb74ae51b355fc9310f2ad
 F ext/fts5/test/fts5ac.test 0990ae7497ebaea2ab5f7fd5caedd93a71a905fc
@@ -135,19 +135,19 @@ F ext/fts5/test/fts5ai.test f20e53bbf0c55bc596f1fd47f2740dae028b8f37
 F ext/fts5/test/fts5aj.test 05b569f5c16ea3098fb1984eec5cf50dbdaae5d8
 F ext/fts5/test/fts5ak.test 7b8c5df96df599293f920b7e5521ebc79f647592
 F ext/fts5/test/fts5al.test fc60ebeac9d8e366e71309d4c31fa72199d711d7
-F ext/fts5/test/fts5alter.test 3342e7fd58556d2a7e5299a7d9dec62e358028ed
+F ext/fts5/test/fts5alter.test 78b63e088646dd623cacbdc1899a54d638dcf3d8
 F ext/fts5/test/fts5auto.test caa5bcf917db11944655a2a9bd38c67c520376ca
-F ext/fts5/test/fts5aux.test e5631607bbc05ac1c38cf7d691000509aca71ef3
-F ext/fts5/test/fts5auxdata.test c69b86092bf1a157172de5f9169731af3403179b
-F ext/fts5/test/fts5bigpl.test b1cfd00561350ab04994ba7dd9d48468e5e0ec3b
-F ext/fts5/test/fts5columnsize.test 771401dd7fc628ecb38316613ed2f3cbe8f2b78a
-F ext/fts5/test/fts5config.test c9cc535f3b36cde1e5a32bf579f3f5962a9e82b2
-F ext/fts5/test/fts5content.test e46904decd896e38c848ad4f38fa4e80251a028b
-F ext/fts5/test/fts5corrupt.test 35bfdbbb3cdcea46ae7385f6432e9b5c574e70a1
-F ext/fts5/test/fts5corrupt2.test c231f532162de381fa83ec477b51cd8633fd9da7
-F ext/fts5/test/fts5corrupt3.test da4e2adb2308d8587c2eff31b5aa47447b8a2edb
-F ext/fts5/test/fts5dlidx.test 070531bd45685e545e3e6021deb543f730a4011b
-F ext/fts5/test/fts5doclist.test 635b80ac785627841a59c583bac702b55d49fdc5
+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/fts5columnsize.test 97dc6bd66c91009d00407aa078dd5e9e8eb22f99
+F ext/fts5/test/fts5config.test ad2ff42ddc856aed2d05bf89dc1c578c8a39ea3b
+F ext/fts5/test/fts5content.test d0d90a45f0bcf07d75d474500d81f941b45e2021
+F ext/fts5/test/fts5corrupt.test 928c9c91d40690d301f943a7ed0ffc19e0d0e7b6
+F ext/fts5/test/fts5corrupt2.test 1a830ccd6dbe1b601c7e3f5bbc1cf77bd8c8803b
+F ext/fts5/test/fts5corrupt3.test 1ccf575f5126e79f9fec7979fd02a1f40a076be3
+F ext/fts5/test/fts5dlidx.test 59b80bbe34169a082c575d9c26f0a7019a7b79c1
+F ext/fts5/test/fts5doclist.test 8edb5b57e5f144030ed74ec00ef6fa4294fed79b
 F ext/fts5/test/fts5ea.test 451bb37310ee6df8ef72e4354fda5621b3b51448
 F ext/fts5/test/fts5eb.test 728a1f23f263548f5c29b29dfb851b5f2dbe723e
 F ext/fts5/test/fts5fault1.test b42d3296be8a75f557cf2cbce0d8b483fc9db45b
@@ -156,27 +156,27 @@ F ext/fts5/test/fts5fault3.test d6e9577d4312e331a913c72931bf131704efc8f3
 F ext/fts5/test/fts5fault4.test 762991d526ee67c2b374351a17248097ea38bee7
 F ext/fts5/test/fts5fault5.test 54da9fd4c3434a1d4f6abdcb6469299d91cf5875
 F ext/fts5/test/fts5fault6.test 234dc6355f8d3f8b5be2763f30699d770247c215
-F ext/fts5/test/fts5full.test 0924bdca5416a242103239ace79c6f5aa34bab8d
-F ext/fts5/test/fts5hash.test bdba7b591d503005d5a81871ba00a359daa1e969
-F ext/fts5/test/fts5integrity.test b45f633381a85dc000e41d68c96ab510985ca35e
-F ext/fts5/test/fts5merge.test 8077454f2975a63f35761f4b8a718b3a808b7c9c
-F ext/fts5/test/fts5near.test d2e3343e62d438f2efd96ebcd83a0d30a16ea6dc
-F ext/fts5/test/fts5optimize.test 0028c90a7817d3e576d1148fc8dff17d89054e54
-F ext/fts5/test/fts5plan.test 7f38179220c9385f88e1470aae6cba134a308b40
-F ext/fts5/test/fts5porter.test 50322599823cb8080a99f0ec0c39f7d0c12bcb5e
-F ext/fts5/test/fts5porter2.test c534385e88e685b354c2b2020acc0c4920042c8e
-F ext/fts5/test/fts5prefix.test 7eba86fc270b110ba2b83ba286a1fd4b3b17955e
-F ext/fts5/test/fts5rank.test f59a6b20ec8e08cb130d833dcece59cf9cd92890
-F ext/fts5/test/fts5rebuild.test 77c6613aa048f38b4a12ddfacb2e6e1342e1b066
-F ext/fts5/test/fts5restart.test cd58a5fb552ac10db549482698e503f82693bcd0
-F ext/fts5/test/fts5rowid.test ca9d91ccb3a4590fc561b2d7a884361bb21e8df5
-F ext/fts5/test/fts5tokenizer.test 668747fcb41de6fc7daebc478920b705164fccc1
-F ext/fts5/test/fts5unicode.test 79b3e34eb29ce4929628aa514a40cb467fdabe4d
-F ext/fts5/test/fts5unicode2.test ad38982b03dc9213445facb16e99f668a74cc4ba
-F ext/fts5/test/fts5unicode3.test 273f9086ad33935566bbc0d0c94d0d9687ef686b
-F ext/fts5/test/fts5unindexed.test f388605341a476b6ab622b4c267cd168f59a5944
-F ext/fts5/test/fts5version.test dc34a735af6625a1a7a4a916a38d122071343887
-F ext/fts5/test/fts5vocab.test 389e5fe4928eae5fddcf26bcc5a6890b0791aa75
+F ext/fts5/test/fts5full.test 6f6143af0c6700501d9fd597189dfab1555bb741
+F ext/fts5/test/fts5hash.test 42eb066f667e9a389a63437cb7038c51974d4fc6
+F ext/fts5/test/fts5integrity.test 29f41d2c7126c6122fbb5d54e556506456876145
+F ext/fts5/test/fts5merge.test 8f3cdba2ec9c5e7e568246e81b700ad37f764367
+F ext/fts5/test/fts5near.test b214cddb1c1f1bddf45c75af768f20145f7e71cc
+F ext/fts5/test/fts5optimize.test 42741e7c085ee0a1276140a752d4407d97c2c9f5
+F ext/fts5/test/fts5plan.test 6a55ecbac9890765b0e16f8c421c7e0888cfe436
+F ext/fts5/test/fts5porter.test 7cdc07bef301d70eebbfa75dcaf45c3680e1d0e1
+F ext/fts5/test/fts5porter2.test 2e65633d58a1c525d5af0f6c01e5a59155bb3487
+F ext/fts5/test/fts5prefix.test 552a462f0e8595676611f41643de217fb4ac2808
+F ext/fts5/test/fts5rank.test 11dcebba31d822f7e99685b4ea2c2ae3ec0b16f1
+F ext/fts5/test/fts5rebuild.test 03935f617ace91ed23a6099c7c74d905227ff29b
+F ext/fts5/test/fts5restart.test c17728fdea26e7d0f617d22ad5b4b2862b994c17
+F ext/fts5/test/fts5rowid.test f7674e19a40987bf59624d8db9827114cb7f7a3e
+F ext/fts5/test/fts5tokenizer.test 83e7e01a21ec7fdf814d51f6184cc26bb77d7695
+F ext/fts5/test/fts5unicode.test fbef8d8a3b4b88470536cc57604a82ca52e51841
+F ext/fts5/test/fts5unicode2.test 84282d4a6dd34370dc19a3486dd6fecc89c7ed0b
+F ext/fts5/test/fts5unicode3.test 35c3d02aa7acf7d43d8de3bfe32c15ba96e8928e
+F ext/fts5/test/fts5unindexed.test e9539d5b78c677315e7ed8ea911d4fd25437c680
+F ext/fts5/test/fts5version.test bed59038e937c40d3c0056d08076db7874c6cd4a
+F ext/fts5/test/fts5vocab.test cdf97b9678484e9bad5062edf9c9106e5c3b0c5c
 F ext/fts5/tool/loadfts5.tcl 7ef3e62131f0434a78e4f5c5b056b09d221710a8
 F ext/fts5/tool/mkfts5c.tcl fdb449263837a18d9131bc2f61b256fd77e64361
 F ext/fts5/tool/showfts5.tcl 921f33b30c3189deefd2b2cc81f951638544aaf1
@@ -1364,7 +1364,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 46e86b0637248fb4d623c97778cc041eabe3636c 7d02e6c992ef92e1f77ebc13889e17c028454b06
-R 86f1f29b38c83a25da1125d5a5eacdb5
+P fcd8f7ce601729dc51d880d16b97040c1be16aa2
+R d44c4485fa78076f45f58b5b04b05b9b
 U dan
-Z c3d1693711def65e5756dddc3dd0ec59
+Z cdc9c7cdbdc63c34e596c23a4d9ea399

diff --git a/manifest.uuid b/manifest.uuid
index f4c59d2e72c05d7b1eb7753f9ab505b1a8e8b316..70e4e52c4deebb452b32816f0704e7a4520385fe 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-fcd8f7ce601729dc51d880d16b97040c1be16aa2
\ No newline at end of file
+3175220747f5d4dadd17e09fb1899dc782c90926
\ No newline at end of file