/ Check-in [53dd7c4c]
Login

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

Overview
Comment:Remove calls to "load_static_extension" from fts5 test scripts.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | amalg-json1-fts5
Files: files | file ages | folders
SHA1: 53dd7c4c65842c5c9ed3e84edd62e24f2c9be15b
User & Date: dan 2015-10-08 21:02:29
Context
2015-10-08
23:37
Json1 tests are working. Builds without FTS5 enabled. Still some problems building with FTS5. check-in: 2928f8e8 user: drh tags: amalg-json1-fts5
21:02
Remove calls to "load_static_extension" from fts5 test scripts. check-in: 53dd7c4c user: dan tags: amalg-json1-fts5
21:00
Further tweaks to main.mk so that fts5 builds as part of testfixture. check-in: 97e11b79 user: dan tags: amalg-json1-fts5
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

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

    13     13   if {![info exists testdir]} {
    14     14     set testdir [file join [file dirname [info script]] .. .. .. test]
    15     15   }
    16     16   source $testdir/tester.tcl
    17     17   
    18     18   catch { 
    19     19     sqlite3_fts5_may_be_corrupt 0 
    20         -  append G(perm:dbconfig) "; load_static_extension \$::dbhandle fts5"
    21     20     reset_db
    22     21   }
    23     22   
    24     23   proc fts5_test_poslist {cmd} {
    25     24     set res [list]
    26     25     for {set i 0} {$i < [$cmd xInstCount]} {incr i} {
    27     26       lappend res [string map {{ } .} [$cmd xInst $i]]

Changes to ext/fts5/test/fts5fault6.test.

   280    280   
   281    281   #-------------------------------------------------------------------------
   282    282   catch { db close }
   283    283   breakpoint
   284    284   do_faultsim_test 6 -faults oom* -prep {
   285    285     sqlite_orig db test.db
   286    286     sqlite3_db_config_lookaside db 0 0 0
   287         -} -body {
   288         -  load_static_extension db fts5
   289    287   } -test {
   290    288     faultsim_test_result {0 {}} {1 {initialization of fts5 failed: }}
   291    289     if {$testrc==0} {
   292    290       db eval { CREATE VIRTUAL TABLE temp.t1 USING fts5(x) }
   293    291     }
   294    292     db close
   295    293   }
   296    294   finish_test
   297    295