From e716aca24b79c52cac5a08f218ec29279c5dda42 Mon Sep 17 00:00:00 2001
From: dan <dan@noemail.net>
Date: Mon, 29 Dec 2014 15:59:36 +0000
Subject: [PATCH] Move all fts5 test files to new directory "ext/fts5/test".

FossilOrigin-Name: 7f148edb30103c5f4fee20cd08e38537f9615bf2
---
 {test => ext/fts5/test}/fts5aa.test     |  4 ++-
 {test => ext/fts5/test}/fts5ab.test     |  4 ++-
 {test => ext/fts5/test}/fts5ac.test     |  4 ++-
 {test => ext/fts5/test}/fts5ad.test     |  4 ++-
 {test => ext/fts5/test}/fts5ae.test     |  4 ++-
 {test => ext/fts5/test}/fts5af.test     |  4 ++-
 {test => ext/fts5/test}/fts5ag.test     |  4 ++-
 {test => ext/fts5/test}/fts5ah.test     |  4 ++-
 {test => ext/fts5/test}/fts5ai.test     |  4 ++-
 {test => ext/fts5/test}/fts5aj.test     |  4 ++-
 {test => ext/fts5/test}/fts5ak.test     |  4 ++-
 {test => ext/fts5/test}/fts5al.test     |  4 ++-
 ext/fts5/{ => test}/fts5auxdata.test    |  2 +-
 {test => ext/fts5/test}/fts5ea.test     |  4 ++-
 {test => ext/fts5/test}/fts5fault1.test |  4 ++-
 ext/fts5/{ => test}/fts5porter.test     |  2 +-
 ext/fts5/{ => test}/fts5tokenizer.test  |  2 +-
 manifest                                | 46 ++++++++++++-------------
 manifest.uuid                           |  2 +-
 test/permutations.test                  |  9 +----
 20 files changed, 70 insertions(+), 49 deletions(-)
 rename {test => ext/fts5/test}/fts5aa.test (98%)
 rename {test => ext/fts5/test}/fts5ab.test (97%)
 rename {test => ext/fts5/test}/fts5ac.test (99%)
 rename {test => ext/fts5/test}/fts5ad.test (99%)
 rename {test => ext/fts5/test}/fts5ae.test (98%)
 rename {test => ext/fts5/test}/fts5af.test (97%)
 rename {test => ext/fts5/test}/fts5ag.test (98%)
 rename {test => ext/fts5/test}/fts5ah.test (96%)
 rename {test => ext/fts5/test}/fts5ai.test (92%)
 rename {test => ext/fts5/test}/fts5aj.test (94%)
 rename {test => ext/fts5/test}/fts5ak.test (97%)
 rename {test => ext/fts5/test}/fts5al.test (98%)
 rename ext/fts5/{ => test}/fts5auxdata.test (97%)
 rename {test => ext/fts5/test}/fts5ea.test (96%)
 rename {test => ext/fts5/test}/fts5fault1.test (96%)
 rename ext/fts5/{ => test}/fts5porter.test (99%)
 rename ext/fts5/{ => test}/fts5tokenizer.test (96%)

diff --git a/test/fts5aa.test b/ext/fts5/test/fts5aa.test
similarity index 98%
rename from test/fts5aa.test
rename to ext/fts5/test/fts5aa.test
index b9440c5c90..7b9bd77b67 100644
--- a/test/fts5aa.test
+++ b/ext/fts5/test/fts5aa.test
@@ -12,7 +12,9 @@
 # focus of this script is testing the FTS5 module.
 #
 
-set testdir [file dirname $argv0]
+if {![info exists testdir]} {
+  set testdir [file join [file dirname [info script]] .. .. .. test]
+}
 source $testdir/tester.tcl
 set testprefix fts5aa
 
diff --git a/test/fts5ab.test b/ext/fts5/test/fts5ab.test
similarity index 97%
rename from test/fts5ab.test
rename to ext/fts5/test/fts5ab.test
index 88b8692787..1b744ebcce 100644
--- a/test/fts5ab.test
+++ b/ext/fts5/test/fts5ab.test
@@ -13,7 +13,9 @@
 #
 #
 
-set testdir [file dirname $argv0]
+if {![info exists testdir]} {
+  set testdir [file join [file dirname [info script]] .. .. .. test]
+}
 source $testdir/tester.tcl
 set testprefix fts5ab
 
diff --git a/test/fts5ac.test b/ext/fts5/test/fts5ac.test
similarity index 99%
rename from test/fts5ac.test
rename to ext/fts5/test/fts5ac.test
index 1044a81932..cd51f31756 100644
--- a/test/fts5ac.test
+++ b/ext/fts5/test/fts5ac.test
@@ -13,7 +13,9 @@
 #
 #
 
-set testdir [file dirname $argv0]
+if {![info exists testdir]} {
+  set testdir [file join [file dirname [info script]] .. .. .. test]
+}
 source $testdir/tester.tcl
 set testprefix fts5ac
 
diff --git a/test/fts5ad.test b/ext/fts5/test/fts5ad.test
similarity index 99%
rename from test/fts5ad.test
rename to ext/fts5/test/fts5ad.test
index bdf71265cf..8af8345efe 100644
--- a/test/fts5ad.test
+++ b/ext/fts5/test/fts5ad.test
@@ -13,7 +13,9 @@
 #
 #
 
-set testdir [file dirname $argv0]
+if {![info exists testdir]} {
+  set testdir [file join [file dirname [info script]] .. .. .. test]
+}
 source $testdir/tester.tcl
 set testprefix fts5ad
 
diff --git a/test/fts5ae.test b/ext/fts5/test/fts5ae.test
similarity index 98%
rename from test/fts5ae.test
rename to ext/fts5/test/fts5ae.test
index b6475d8bbf..644ef99d21 100644
--- a/test/fts5ae.test
+++ b/ext/fts5/test/fts5ae.test
@@ -13,7 +13,9 @@
 #
 #
 
-set testdir [file dirname $argv0]
+if {![info exists testdir]} {
+  set testdir [file join [file dirname [info script]] .. .. .. test]
+}
 source $testdir/tester.tcl
 set testprefix fts5ae
 
diff --git a/test/fts5af.test b/ext/fts5/test/fts5af.test
similarity index 97%
rename from test/fts5af.test
rename to ext/fts5/test/fts5af.test
index ca56c0ec1c..3e7ff918b8 100644
--- a/test/fts5af.test
+++ b/ext/fts5/test/fts5af.test
@@ -15,7 +15,9 @@
 # snippet() function.
 #
 
-set testdir [file dirname $argv0]
+if {![info exists testdir]} {
+  set testdir [file join [file dirname [info script]] .. .. .. test]
+}
 source $testdir/tester.tcl
 set testprefix fts5af
 
diff --git a/test/fts5ag.test b/ext/fts5/test/fts5ag.test
similarity index 98%
rename from test/fts5ag.test
rename to ext/fts5/test/fts5ag.test
index 52b4774d55..e3659a71d5 100644
--- a/test/fts5ag.test
+++ b/ext/fts5/test/fts5ag.test
@@ -12,7 +12,9 @@
 # focus of this script is testing the FTS5 module.
 #
 
-set testdir [file dirname $argv0]
+if {![info exists testdir]} {
+  set testdir [file join [file dirname [info script]] .. .. .. test]
+}
 source $testdir/tester.tcl
 set testprefix fts5ag
 
diff --git a/test/fts5ah.test b/ext/fts5/test/fts5ah.test
similarity index 96%
rename from test/fts5ah.test
rename to ext/fts5/test/fts5ah.test
index b1dffc78fa..c01d966704 100644
--- a/test/fts5ah.test
+++ b/ext/fts5/test/fts5ah.test
@@ -12,7 +12,9 @@
 # focus of this script is testing the FTS5 module.
 #
 
-set testdir [file dirname $argv0]
+if {![info exists testdir]} {
+  set testdir [file join [file dirname [info script]] .. .. .. test]
+}
 source $testdir/tester.tcl
 set testprefix fts5ah
 
diff --git a/test/fts5ai.test b/ext/fts5/test/fts5ai.test
similarity index 92%
rename from test/fts5ai.test
rename to ext/fts5/test/fts5ai.test
index eba9d09d71..78a346b04a 100644
--- a/test/fts5ai.test
+++ b/ext/fts5/test/fts5ai.test
@@ -14,7 +14,9 @@
 # Specifically, it tests transactions and savepoints
 #
 
-set testdir [file dirname $argv0]
+if {![info exists testdir]} {
+  set testdir [file join [file dirname [info script]] .. .. .. test]
+}
 source $testdir/tester.tcl
 set testprefix fts5ai
 
diff --git a/test/fts5aj.test b/ext/fts5/test/fts5aj.test
similarity index 94%
rename from test/fts5aj.test
rename to ext/fts5/test/fts5aj.test
index 49386f57bc..3e12934c05 100644
--- a/test/fts5aj.test
+++ b/ext/fts5/test/fts5aj.test
@@ -16,7 +16,9 @@
 # and deleted,
 #
 
-set testdir [file dirname $argv0]
+if {![info exists testdir]} {
+  set testdir [file join [file dirname [info script]] .. .. .. test]
+}
 source $testdir/tester.tcl
 set testprefix fts5aj
 
diff --git a/test/fts5ak.test b/ext/fts5/test/fts5ak.test
similarity index 97%
rename from test/fts5ak.test
rename to ext/fts5/test/fts5ak.test
index 53977ab70c..c16056b72e 100644
--- a/test/fts5ak.test
+++ b/ext/fts5/test/fts5ak.test
@@ -14,7 +14,9 @@
 # Specifically, the auxiliary function "highlight".
 #
 
-set testdir [file dirname $argv0]
+if {![info exists testdir]} {
+  set testdir [file join [file dirname [info script]] .. .. .. test]
+}
 source $testdir/tester.tcl
 set testprefix fts5ak
 
diff --git a/test/fts5al.test b/ext/fts5/test/fts5al.test
similarity index 98%
rename from test/fts5al.test
rename to ext/fts5/test/fts5al.test
index 236fdf8521..926ad951cf 100644
--- a/test/fts5al.test
+++ b/ext/fts5/test/fts5al.test
@@ -14,7 +14,9 @@
 # Specifically, this function tests the %_config table.
 #
 
-set testdir [file dirname $argv0]
+if {![info exists testdir]} {
+  set testdir [file join [file dirname [info script]] .. .. .. test]
+}
 source $testdir/tester.tcl
 set testprefix fts5al
 
diff --git a/ext/fts5/fts5auxdata.test b/ext/fts5/test/fts5auxdata.test
similarity index 97%
rename from ext/fts5/fts5auxdata.test
rename to ext/fts5/test/fts5auxdata.test
index 158e393c32..661a78526a 100644
--- a/ext/fts5/fts5auxdata.test
+++ b/ext/fts5/test/fts5auxdata.test
@@ -13,7 +13,7 @@
 #
 
 if {![info exists testdir]} {
-  set testdir [file join [file dirname [info script]] .. .. test]
+  set testdir [file join [file dirname [info script]] .. .. .. test]
 }
 source $testdir/tester.tcl
 set testprefix fts5auxdata
diff --git a/test/fts5ea.test b/ext/fts5/test/fts5ea.test
similarity index 96%
rename from test/fts5ea.test
rename to ext/fts5/test/fts5ea.test
index 1518b8892c..19e1903433 100644
--- a/test/fts5ea.test
+++ b/ext/fts5/test/fts5ea.test
@@ -10,7 +10,9 @@
 #*************************************************************************
 #
 
-set testdir [file dirname $argv0]
+if {![info exists testdir]} {
+  set testdir [file join [file dirname [info script]] .. .. .. test]
+}
 source $testdir/tester.tcl
 set testprefix fts5ea
 
diff --git a/test/fts5fault1.test b/ext/fts5/test/fts5fault1.test
similarity index 96%
rename from test/fts5fault1.test
rename to ext/fts5/test/fts5fault1.test
index 8a493e323f..5f340e0fd7 100644
--- a/test/fts5fault1.test
+++ b/ext/fts5/test/fts5fault1.test
@@ -12,7 +12,9 @@
 # focus of this script is testing the FTS5 module.
 #
 
-set testdir [file dirname $argv0]
+if {![info exists testdir]} {
+  set testdir [file join [file dirname [info script]] .. .. .. test]
+}
 source $testdir/tester.tcl
 source $testdir/malloc_common.tcl
 set testprefix fts5fault1
diff --git a/ext/fts5/fts5porter.test b/ext/fts5/test/fts5porter.test
similarity index 99%
rename from ext/fts5/fts5porter.test
rename to ext/fts5/test/fts5porter.test
index 7c67f83dab..9254626471 100644
--- a/ext/fts5/fts5porter.test
+++ b/ext/fts5/test/fts5porter.test
@@ -15,7 +15,7 @@
 #
 
 if {![info exists testdir]} {
-  set testdir [file join [file dirname [info script]] .. .. test]
+  set testdir [file join [file dirname [info script]] .. .. .. test]
 }
 source $testdir/tester.tcl
 set testprefix fts5porter
diff --git a/ext/fts5/fts5tokenizer.test b/ext/fts5/test/fts5tokenizer.test
similarity index 96%
rename from ext/fts5/fts5tokenizer.test
rename to ext/fts5/test/fts5tokenizer.test
index 9fa853c84c..bd2eb7aae2 100644
--- a/ext/fts5/fts5tokenizer.test
+++ b/ext/fts5/test/fts5tokenizer.test
@@ -13,7 +13,7 @@
 #
 
 if {![info exists testdir]} {
-  set testdir [file join [file dirname [info script]] .. .. test]
+  set testdir [file join [file dirname [info script]] .. .. .. test]
 }
 source $testdir/tester.tcl
 set testprefix fts5tokenizer
diff --git a/manifest b/manifest
index e0c9552b7b..d8bf03435a 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fixes\sto\sbuilt-in\stokenizers.
-D 2014-12-29T11:24:46.773
+C Move\sall\sfts5\stest\sfiles\sto\snew\sdirectory\s"ext/fts5/test".
+D 2014-12-29T15:59:36.706
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in b03432313a3aad96c706f8164fb9f5307eaf19f5
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -116,10 +116,24 @@ F ext/fts5/fts5_index.c 4a8e8535b4303400ddb5f6fb08152da0d88ebf6f
 F ext/fts5/fts5_storage.c 13794781977c9a624eb8bd7b9509de241e405853
 F ext/fts5/fts5_tcl.c ce11e46589986b957b89809aabd3936d898d501b
 F ext/fts5/fts5_tokenize.c 5d6e785345b0d87d174fcc0653bfacd0d9fd7f2e
-F ext/fts5/fts5auxdata.test 3844d0f098441cedf75b9cc96d5e6e94d1a3bef4
 F ext/fts5/fts5parse.y 777da8e5819f75c217982c79c29d014c293acac9
-F ext/fts5/fts5porter.test bb0fba17ce825527addec33fdb12b0062aabd588
-F ext/fts5/fts5tokenizer.test 09096cebc17a41650b52eec6e45c9a29923bfdcd w ext/fts5/fts5porter2.test
+F ext/fts5/test/fts5aa.test 01fff9cf4e75c33871dd121d6adae33b609542cf w test/fts5aa.test
+F ext/fts5/test/fts5ab.test 7a58a954cae2ae50cef3ee525c57bc8eb3eb50b3 w test/fts5ab.test
+F ext/fts5/test/fts5ac.test d3de838f48d2ac8c26386832f6d93a3a3dbb5d4b w test/fts5ac.test
+F ext/fts5/test/fts5ad.test a8311d6ce46964fa1686937793dd81d284317324 w test/fts5ad.test
+F ext/fts5/test/fts5ae.test e576e646013489ce458a5b276caa787035efb175 w test/fts5ae.test
+F ext/fts5/test/fts5af.test 7e4c679bc6337ddcde6a3c9b9d81c81d2f7e77bd w test/fts5af.test
+F ext/fts5/test/fts5ag.test c79ee7707d120b79869fa2ac1538639b9fa1b997 w test/fts5ag.test
+F ext/fts5/test/fts5ah.test e510c741e9833d6335c87bef2e7f93fecfcc7c1d w test/fts5ah.test
+F ext/fts5/test/fts5ai.test 6a22f43776e1612591392721b535ca28d2c1a19f w test/fts5ai.test
+F ext/fts5/test/fts5aj.test 1a64ab4144f54bd12a520683950bf8460dd74fb3 w test/fts5aj.test
+F ext/fts5/test/fts5ak.test df2669fb76684f03d03918dfb2cf692012251b1f w test/fts5ak.test
+F ext/fts5/test/fts5al.test c055f1d682f931b8ea6c6e6251d90925f2aa55a1 w test/fts5al.test
+F ext/fts5/test/fts5auxdata.test fec4c9113176d351e567eab65fe9917e5ea0ab05 w ext/fts5/fts5auxdata.test
+F ext/fts5/test/fts5ea.test 0ef2c89e14c6360ad3905fae44409420d6b5a5c8 w test/fts5ea.test
+F ext/fts5/test/fts5fault1.test b95ed600b88bbbce5390f9097a5a5b7b01b3b9f7 w test/fts5fault1.test
+F ext/fts5/test/fts5porter.test d8f7591b733bcc1f02ca0dd313bc891a4b289562 w ext/fts5/fts5porter.test
+F ext/fts5/test/fts5tokenizer.test a1f3128e0d42c93632122c76cbe0d07a901591ca w ext/fts5/fts5tokenizer.test
 F ext/icu/README.txt d9fbbad0c2f647c3fdf715fc9fd64af53aedfc43
 F ext/icu/icu.c d415ccf984defeb9df2c0e1afcfaa2f6dc05eacb
 F ext/icu/sqliteicu.h 728867a802baa5a96de7495e9689a8e01715ef37
@@ -603,20 +617,6 @@ F test/fts4merge4.test d895b1057a7798b67e03455d0fa50e9ea836c47b
 F test/fts4noti.test 524807f0c36d49deea7920cdd4cd687408b58849
 F test/fts4unicode.test 01ec3fe2a7c3cfff3b4c0581b83caa11b33efa36
 F test/fts5_common.tcl 2488117cd80b7a4de7c20054b89f082b77b4189c
-F test/fts5aa.test 27c7d3c865e144a0501dcbfbd6d2ae87f77602ea
-F test/fts5ab.test 52f6b9223372ff70b0edb5a3054fbd7bc7fcfefc
-F test/fts5ac.test 021e175b809d2baa23792807caae5dfc6bc706f4
-F test/fts5ad.test ff518db6b0d7750b51ee6531ffebf82e57094bfd
-F test/fts5ae.test 0877873a2b9df6b3a2d832ed5ea928f838d19faf
-F test/fts5af.test 355d2048bd9ddc2f8f4e80a4cb1e70c6204422a0
-F test/fts5ag.test 8b2bb67cf2a3245eaad5e49ab8daa6be6e64332b
-F test/fts5ah.test 788e923e60b5e7a559f672cfbf262b8b260ea176
-F test/fts5ai.test aa2b5fd0f8d2cf59ac0211111e63cbca3b40ed7d
-F test/fts5aj.test bc3d91bd012c7ca175cdf266c2074920bb5fa5ba
-F test/fts5ak.test 26187e57ba56a9e10e6da894a038b07588e7249d
-F test/fts5al.test 61b067f3b0b61679ab164a8a855882dfd313988d
-F test/fts5ea.test afaf3497b43add578384dc1fd26b0342738abe87
-F test/fts5fault1.test ba59b6f0897a4fe510c446b98968ec1e8800a56b
 F test/full.test 6b3c8fb43c6beab6b95438c1675374b95fab245d
 F test/func.test ae97561957aba6ca9e3a7b8a13aac41830d701ef
 F test/func2.test 772d66227e4e6684b86053302e2d74a2500e1e0f
@@ -783,7 +783,7 @@ F test/pagesize.test 1dd51367e752e742f58e861e65ed7390603827a0
 F test/pcache.test b09104b03160aca0d968d99e8cd2c5b1921a993d
 F test/pcache2.test a83efe2dec0d392f814bfc998def1d1833942025
 F test/percentile.test b98fc868d71eb5619d42a1702e9ab91718cbed54
-F test/permutations.test a762abd3f97809c877c93e6b526ec07bb2a75b96
+F test/permutations.test f26508e576234a5875041dd1632c5eed9fc495d9
 F test/pragma.test adb21a90875bc54a880fa939c4d7c46598905aa0
 F test/pragma2.test aea7b3d82c76034a2df2b38a13745172ddc0bc13
 F test/printf.test ec9870c4dce8686a37818e0bf1aba6e6a1863552
@@ -1212,7 +1212,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 1ac7a8d0af9a71ddf6a1421033dcb9fa67c6120c
-R c89483d1ebbc9d631471515ddc2ac098
+P b33fe0dd89f3180c209fa1f9e75d0a7acab12b8e
+R c65f16b94aeceea9cda28cb8f092d4a9
 U dan
-Z 32745924be785a3126a9785b730c9992
+Z 822a98c34fd542b912bf890d737a0e9f
diff --git a/manifest.uuid b/manifest.uuid
index c3d3f24818..7b2535c49c 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b33fe0dd89f3180c209fa1f9e75d0a7acab12b8e
\ No newline at end of file
+7f148edb30103c5f4fee20cd08e38537f9615bf2
\ No newline at end of file
diff --git a/test/permutations.test b/test/permutations.test
index 4e366ca36f..c5b83cb821 100644
--- a/test/permutations.test
+++ b/test/permutations.test
@@ -224,14 +224,7 @@ test_suite "fts3" -prefix "" -description {
 
 test_suite "fts5" -prefix "" -description {
   All FTS5 tests.
-} -files {
-  fts5aa.test fts5ab.test fts5ac.test fts5ad.test fts5ae.test 
-  fts5af.test fts5ag.test fts5ah.test fts5ai.test fts5aj.test
-  fts5ak.test fts5al.test
-  fts5ea.test
-
-  fts5fault1.test
-}
+} -files [glob -nocomplain $::testdir/../ext/fts5/test/*.test]
 
 test_suite "nofaultsim" -prefix "" -description {
   "Very" quick test suite. Runs in less than 5 minutes on a workstation.