From: dan <dan@noemail.net>
Date: Tue, 3 Apr 2012 18:34:24 +0000 (+0000)
Subject: Do not run attempt to run test file fts4merge3.test unless the build includes FTS.
X-Git-Tag: version-3.7.12~49
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c8f8616c411a5dfe39469aed23ad7b6008bbd3a7;p=thirdparty%2Fsqlite.git

Do not run attempt to run test file fts4merge3.test unless the build includes FTS.

FossilOrigin-Name: 0506bf86d31e821a905e3a8a03c4817e326f7f44
---

diff --git a/manifest b/manifest
index 00bf39318a..c9deb0c9af 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Modify\scapi3.test\sand\scapi3c.test\sso\sthat\sthey\swork\swith\sSQLITE_OMIT_AUTORESET\sbuilds.
-D 2012-04-03T18:33:43.337
+C Do\snot\srun\sattempt\sto\srun\stest\sfile\sfts4merge3.test\sunless\sthe\sbuild\sincludes\sFTS.
+D 2012-04-03T18:34:24.492
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 2f37e468503dbe79d35c9f6dffcf3fae1ae9ec20
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -502,7 +502,7 @@ F test/fts4content.test 17b2360f7d1a9a7e5aa8022783f5c5731b6dfd4f
 F test/fts4langid.test 24a6e41063b416bbdf371ff6b4476fa41c194aa7
 F test/fts4merge.test c424309743fdd203f8e56a1f1cd7872cd66cc0ee
 F test/fts4merge2.test 5faa558d1b672f82b847d2a337465fa745e46891
-F test/fts4merge3.test 640611c05f01e9e018ac10afd188b018d8fcd4e5
+F test/fts4merge3.test 125c3334f49bc171b3310efc99358cd05475c1d6
 F test/func.test 9809b7622d721904a8cc33c1ffb87f46d506ed01
 F test/func2.test 772d66227e4e6684b86053302e2d74a2500e1e0f
 F test/func3.test 001021e5b88bd02a3b365a5c5fd8f6f49d39744a
@@ -1000,7 +1000,7 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
-P fa3a498dfe9ed59c30da5eaa0d7cad167fd4e393
-R 93f41d5cd0dd5634edd499aa7b12c353
+P 1d5e744cc645150ccaa7256663146fc7b8540bd5
+R 1f313aea8b457ed25b447b7c1422a6b5
 U dan
-Z 6ebde95baa77d452c6bdb9a26f49bf26
+Z 3c559de9db801435fc52303089f6fab9
diff --git a/manifest.uuid b/manifest.uuid
index da300bb8d4..136f7e72d9 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-1d5e744cc645150ccaa7256663146fc7b8540bd5
\ No newline at end of file
+0506bf86d31e821a905e3a8a03c4817e326f7f44
\ No newline at end of file
diff --git a/test/fts4merge3.test b/test/fts4merge3.test
index d591329fb0..3fd300daf9 100644
--- a/test/fts4merge3.test
+++ b/test/fts4merge3.test
@@ -20,6 +20,11 @@ source $testdir/bc_common.tcl
 
 set ::testprefix fts4merge3
 
+ifcapable !fts3 {
+  finish_test
+  return
+}
+
 if {"" == [bc_find_binaries backcompat.test]} {
   finish_test
   return