Remove the "#ifdef SQLITE_TEST" condition from fts5_test_mi.c. Update fts5_main.c...

FossilOrigin-Name: 87e6e225aea3a4d10476d16eab4a6403a4a128c9

diff --git a/ext/fts5/fts5_main.c b/ext/fts5/fts5_main.c
index fe1d72e2b0ee1a399c856a8fb42c93ca78532f01..28f3f3e62c41f86528d15b065234f23dc556c2b3 100644 (file)
--- a/ext/fts5/fts5_main.c
+++ b/ext/fts5/fts5_main.c
@@ -2665,6 +2665,17 @@ static int fts5Init(sqlite3 *db){
       );
     }
   }
+
+  /* If SQLITE_FTS5_ENABLE_TEST_MI is defined, assume that the file
+  ** fts5_test_mi.c is compiled and linked into the executable. And call
+  ** its entry point to enable the matchinfo() demo.  */
+#ifdef SQLITE_FTS5_ENABLE_TEST_MI
+  if( rc==SQLITE_OK ){
+    extern int sqlite3Fts5TestRegisterMatchinfo(sqlite3*);
+    rc = sqlite3Fts5TestRegisterMatchinfo(db);
+  }
+#endif
+
   return rc;
 }
 

diff --git a/ext/fts5/fts5_test_mi.c b/ext/fts5/fts5_test_mi.c
index 30c0d3f43aed6a1c299cf48d227a9c0e5b88bd9d..96fad6d331c19a2526946d0231f70d0e18d659a3 100644 (file)
--- a/ext/fts5/fts5_test_mi.c
+++ b/ext/fts5/fts5_test_mi.c
@@ -41,7 +41,6 @@
 */
 
 
-#ifdef SQLITE_TEST
 #ifdef SQLITE_ENABLE_FTS5
 
 #include "fts5.h"
@@ -416,5 +415,4 @@ int sqlite3Fts5TestRegisterMatchinfo(sqlite3 *db){
 }
 
 #endif /* SQLITE_ENABLE_FTS5 */
-#endif /* SQLITE_TEST */
 

diff --git a/manifest b/manifest
index e4904b1ac71c6a723063db1ae5b7ffcf0becd5d1..c3c0371b9554114e9469f715e6fcac014091e276 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Improve\stest\scoverage\sof\sdemo\scode\sin\sfts5_test_mi.c.
-D 2016-02-17T14:11:06.434
+C Remove\sthe\s"#ifdef\sSQLITE_TEST"\scondition\sfrom\sfts5_test_mi.c.\sUpdate\sfts5_main.c\sso\sthat\sif\sSQLITE_FTS5_TEST_MI\sis\sdefined\swhen\sit\sis\sbuilt\sthe\sfts5_test_mi.c\sentry\spoint\sis\sautomatically\scalled.\sThis\smakes\sit\seasier\sto\sbuild\sversions\sof\sfts5\sthat\sinclude\sthe\smatchinfo()\sdemo\sby\sdefault.
+D 2016-02-17T14:48:26.564
 F Makefile.in 4e90dc1521879022aa9479268a4cd141d1771142
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 30f075dc4f27a07abb76088946b2944178d85347
@@ -105,10 +105,10 @@ F ext/fts5/fts5_config.c 35c5173cae4eb17e82164a7f5aeef56a48903079
 F ext/fts5/fts5_expr.c 8e8e4635f655133eb39018072fc0f0942a2c4337
 F ext/fts5/fts5_hash.c f3a7217c86eb8f272871be5f6aa1b6798960a337
 F ext/fts5/fts5_index.c 78069efb54559a17c35906a741362d0b5c899bd0
-F ext/fts5/fts5_main.c 0e01ead4e817483e378e7e38e6d902f50b68d29e
+F ext/fts5/fts5_main.c db24ac714c6c4a1b3c24a1f8c25889f2952148c1
 F ext/fts5/fts5_storage.c f8343db90d8c95a4d4b52f6676e354b4649ffd6e
 F ext/fts5/fts5_tcl.c f8731e0508299bd43f1a2eff7dbeaac870768966
-F ext/fts5/fts5_test_mi.c d491f9277fcf2b91312a261b9cb4c10da1ff1734
+F ext/fts5/fts5_test_mi.c c1bb729651d86c7c70bcd1ec3f12fa83f97035cc
 F ext/fts5/fts5_test_tok.c db08af63673c3a7d39f053b36fd6e065017706be
 F ext/fts5/fts5_tokenize.c 2ce7b44183538ec46b7907726262ee43ffdd39a8
 F ext/fts5/fts5_unicode2.c b450b209b157d598f7b9df9f837afb75a14c24bf
@@ -1428,7 +1428,7 @@ F tool/vdbe_profile.tcl 246d0da094856d72d2c12efec03250d71639d19f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh a98af506df552f3b3c0d904f94e4cdc4e1a6d598
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 53fd040c98d9647ea135d43c493777bf8da4aebd
-R 145e645c5948689d8fe331e9c7c65bd5
+P 8a78050dc0e374a0df0f29716df60250e2c4b4f7
+R 3d71cd697bdb97ce7af07964f4cb4585
 U dan
-Z f405d2e5930c75fdd0f048c483569008
+Z 2fd981c5711b99aa40969af5d950bdc1

diff --git a/manifest.uuid b/manifest.uuid
index 3ecc2854d7fec53a61bcb54eb5c10dbf655013db..c8a854d2f5ceb6203b2072ae8e3c129a92a311bb 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8a78050dc0e374a0df0f29716df60250e2c4b4f7
\ No newline at end of file
+87e6e225aea3a4d10476d16eab4a6403a4a128c9
\ No newline at end of file