/ Check-in [b2a03e2d]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Fix an error in an fts5 test script.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | branch-3.11
Files: files | file ages | folders
SHA1:b2a03e2d479aec2fc68dfc83a1fa34c740f44e13
User & Date: dan 2016-03-02 13:26:19
Context
2016-03-02
15:37
Fix a recently introduced problem in permutations.test causing an error when the QUICKTEST_OMIT environment variable is defined. check-in: 45bc9557 user: dan tags: branch-3.11
13:26
Fix an error in an fts5 test script. check-in: b2a03e2d user: dan tags: branch-3.11
2016-03-01
16:56
Do not attempt to run fts5bigtok.test or fts5merge2.test if FTS5 is not compiled in. check-in: f7ed3739 user: dan tags: branch-3.11
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to ext/fts5/test/fts5_common.tcl.

    17     17   
    18     18   ifcapable !fts5 {
    19     19     proc return_if_no_fts5 {} {
    20     20       finish_test
    21     21       return -code return
    22     22     }
    23     23     return
           24  +} else {
           25  +  proc return_if_no_fts5 {} {}
    24     26   }
    25     27   
    26     28   catch { 
    27     29     sqlite3_fts5_may_be_corrupt 0 
    28     30     reset_db
    29     31   }
    30     32   

Changes to ext/fts5/test/fts5merge2.test.

    23     23         puts "[lrange $lvl 0 1] $seg"
    24     24       }
    25     25     }
    26     26   }
    27     27   
    28     28   foreach_detail_mode $testprefix {
    29     29   
    30         -if {[detail_is_none]==0} continue
    31         -
    32     30   do_execsql_test 1.0 {
    33     31     CREATE VIRTUAL TABLE t1 USING fts5(x, detail=%DETAIL%);
    34     32     INSERT INTO t1(t1, rank) VALUES('pgsz', 32);
    35     33     INSERT INTO t1(t1, rank) VALUES('crisismerge', 2);
    36     34     INSERT INTO t1 VALUES('1 2 3 4');
    37     35   }
    38     36