Index: third_party/sqlite/src/test/fts3.test |
diff --git a/third_party/sqlite/src/test/fts3.test b/third_party/sqlite/src/test/fts3.test |
index 2e653899b032ae9ef5bed1c2ccd777f352c88d14..f42220bdc80ff8516468500c6644b6d7cb286d76 100644 |
--- a/third_party/sqlite/src/test/fts3.test |
+++ b/third_party/sqlite/src/test/fts3.test |
@@ -9,60 +9,11 @@ |
# |
# $Id: fts3.test,v 1.2 2008/07/23 18:17:32 drh Exp $ |
-proc lshift {lvar} { |
- upvar $lvar l |
- set ret [lindex $l 0] |
- set l [lrange $l 1 end] |
- return $ret |
-} |
-while {[set arg [lshift argv]] != ""} { |
- switch -- $arg { |
- -sharedpagercache { |
- sqlite3_enable_shared_cache 1 |
- } |
- -soak { |
- set SOAKTEST 1 |
- } |
- default { |
- set argv [linsert $argv 0 $arg] |
- break |
- } |
- } |
-} |
- |
set testdir [file dirname $argv0] |
-source $testdir/tester.tcl |
-# If SQLITE_ENABLE_FTS3 is defined, omit this file. |
-ifcapable !fts3 { |
- return |
-} |
-rename finish_test really_finish_test |
-proc finish_test {} {} |
-set ISQUICK 1 |
- |
-set EXCLUDE { |
- fts3.test |
-} |
- |
-# Files to include in the test. If this list is empty then everything |
-# that is not in the EXCLUDE list is run. |
-# |
-set INCLUDE { |
-} |
+source $testdir/permutations.test |
-foreach testfile [lsort -dictionary [glob $testdir/fts3*.test]] { |
- set tail [file tail $testfile] |
- if {[lsearch -exact $EXCLUDE $tail]>=0} continue |
- if {[llength $INCLUDE]>0 && [lsearch -exact $INCLUDE $tail]<0} continue |
- source $testfile |
- catch {db close} |
- if {$sqlite_open_file_count>0} { |
- puts "$tail did not close all files: $sqlite_open_file_count" |
- incr nErr |
- lappend ::failList $tail |
- set sqlite_open_file_count 0 |
- } |
+ifcapable fts3 { |
+ run_test_suite fts3 |
} |
-set sqlite_open_file_count 0 |
-really_finish_test |
+finish_test |