From 4e653855abe40bfc997098411652c1aad795d32c Mon Sep 17 00:00:00 2001 From: drh Date: Wed, 24 Jan 2007 03:46:35 +0000 Subject: [PATCH] Do not run the fts2i.test unless the FTS2 module is available. (CVS 3601) FossilOrigin-Name: 310f68585188ae49b603af9bdef4ee7738ae37c0 --- manifest | 12 ++++++------ manifest.uuid | 2 +- test/fts2i.test | 8 +++++++- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/manifest b/manifest index db735ab793..a14c404493 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Do\snot\srun\stest\sfts1i.test\sif\sFTS1\sis\snot\sinstalled.\s(CVS\s3600) -D 2007-01-24T03:43:20 +C Do\snot\srun\sthe\sfts2i.test\sunless\sthe\sFTS2\smodule\sis\savailable.\s(CVS\s3601) +D 2007-01-24T03:46:35 F Makefile.in 7fa74bf4359aa899da5586e394d17735f221315f F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028 @@ -216,7 +216,7 @@ F test/fts2e.test 2da13dbc2d009105f42196845c1e1ce136c03d38 F test/fts2f.test b5f2dde48199d79e859f59d3d857c17dd62a0129 F test/fts2g.test c69a8ab43ec77d123976ba6cf9422d647ae63032 F test/fts2h.test 223af921323b409d4b5b18ff4e51619541b174bb -F test/fts2i.test 7e28587a64056b86941cc6df6dc8a4379111d9bb +F test/fts2i.test 1b22451d1f13f7c509baec620dc3a4a754885dd6 F test/func.test 0ed54b5aeaad319f68016c033acfebef56f5874a F test/hook.test 7e7645fd9a033f79cce8fdff151e32715e7ec50a F test/in.test 369cb2aa1eab02296b4ec470732fe8c131260b1d @@ -427,7 +427,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513 -P 66cbbe0442a0d270ec968a9c5bca735bd238768a -R d2970e0b1a1e8dfc43c72d7504b5180c +P 810c0176f8413995a78963c453e4377f11b293b5 +R 37a170980624908c75f237e7f767c63e U drh -Z 98f3f4c2c4acba579fc8bd27893bef5a +Z 70e488812d923808b7de40f02231550c diff --git a/manifest.uuid b/manifest.uuid index 24dbdb391e..4a729285e8 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -810c0176f8413995a78963c453e4377f11b293b5 \ No newline at end of file +310f68585188ae49b603af9bdef4ee7738ae37c0 \ No newline at end of file diff --git a/test/fts2i.test b/test/fts2i.test index 88252fdbc4..e732e6a8a9 100644 --- a/test/fts2i.test +++ b/test/fts2i.test @@ -7,12 +7,18 @@ # focus here is testing handling of UPDATE when using UTF-16-encoded # databases. # -# $Id: fts2i.test,v 1.1 2007/01/19 22:59:57 shess Exp $ +# $Id: fts2i.test,v 1.2 2007/01/24 03:46:35 drh Exp $ # set testdir [file dirname $argv0] source $testdir/tester.tcl +# If SQLITE_ENABLE_FTS2 is defined, omit this file. +ifcapable !fts2 { + finish_test + return +} + # Return the UTF-16 representation of the supplied UTF-8 string $str. # If $nt is true, append two 0x00 bytes as a nul terminator. # NOTE(shess) Copied from capi3.test.