/ 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 Unified Diffs Ignore Whitespace Patch

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

17
18
19
20
21
22
23


24
25
26
27
28
29
30

ifcapable !fts5 {
  proc return_if_no_fts5 {} {
    finish_test
    return -code return
  }
  return


}

catch { 
  sqlite3_fts5_may_be_corrupt 0 
  reset_db
}








>
>







17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32

ifcapable !fts5 {
  proc return_if_no_fts5 {} {
    finish_test
    return -code return
  }
  return
} else {
  proc return_if_no_fts5 {} {}
}

catch { 
  sqlite3_fts5_may_be_corrupt 0 
  reset_db
}

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

23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
      puts "[lrange $lvl 0 1] $seg"
    }
  }
}

foreach_detail_mode $testprefix {

if {[detail_is_none]==0} continue

do_execsql_test 1.0 {
  CREATE VIRTUAL TABLE t1 USING fts5(x, detail=%DETAIL%);
  INSERT INTO t1(t1, rank) VALUES('pgsz', 32);
  INSERT INTO t1(t1, rank) VALUES('crisismerge', 2);
  INSERT INTO t1 VALUES('1 2 3 4');
}








<
<







23
24
25
26
27
28
29


30
31
32
33
34
35
36
      puts "[lrange $lvl 0 1] $seg"
    }
  }
}

foreach_detail_mode $testprefix {



do_execsql_test 1.0 {
  CREATE VIRTUAL TABLE t1 USING fts5(x, detail=%DETAIL%);
  INSERT INTO t1(t1, rank) VALUES('pgsz', 32);
  INSERT INTO t1(t1, rank) VALUES('crisismerge', 2);
  INSERT INTO t1 VALUES('1 2 3 4');
}