/ Check-in [462b52b1]
Login

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

Overview
Comment:Fix a test script error causing tests to fail in soak.test.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256:462b52b121c1882e0eca819bc30c0f6e94d7fdd60047d2c32adeff3a1eb70546
User & Date: dan 2018-04-27 16:35:44
Context
2018-04-27
18:05
Update test script fts3expr4.test so that it always creates fts3 tokenizers in the "en_US" locality. check-in: 576a8f69 user: dan tags: trunk
16:35
Fix a test script error causing tests to fail in soak.test. check-in: 462b52b1 user: dan tags: trunk
15:17
Enhance the comments in the templatevtab.c implementation. check-in: 05f6278a user: drh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to test/fuzz_malloc.test.

    53     53     execsql $::prep
    54     54     set jj 0
    55     55     for {set ii 0} {$ii < $::fuzzyopts(-repeats)} {incr ii} {
    56     56       expr srand($jj)
    57     57       incr jj
    58     58       set ::sql [subst $::fuzzyopts(-template)]
    59     59       # puts fuzyy-sql=\[$::sql\]; flush stdout
    60         -    foreach {rc res} [catchsql "$::sql"] {}
           60  +    foreach {rc ::fmtres} [catchsql "$::sql"] {}
    61     61       if {$rc==0} {
    62     62         set nErr1 [set_test_counter errors]
    63         -      do_malloc_test $testname-$ii -sqlbody $::sql -sqlprep $::prep
           63  +      do_faultsim_test $testname-$ii -faults oom* -body {
           64  +        execsql $::sql
           65  +      } -test {
           66  +        if {$testrc && $testresult!="datatype mismatch"} { 
           67  +          faultsim_test_result {0 {}}
           68  +        }
           69  +      }
    64     70         if {[set_test_counter errors]>$nErr1} {
    65     71           puts "Previous fuzzy-sql=\[$::sql\]"
    66     72           flush stdout
    67     73         }
    68     74       } else {
    69     75         incr ii -1
    70     76       }

Changes to test/soak.test.

    63     63     fuzz_malloc.test
    64     64     trans.test
    65     65     corruptC.test
    66     66   }
    67     67   
    68     68   set G(isquick) 1
    69     69   
    70         -set soak_starttime  [clock seconds]
           70  +set soak_starttime  [clock_seconds]
    71     71   set soak_finishtime [expr {$soak_starttime + $TIMEOUT}]
    72     72   
    73     73   # Loop until the timeout is reached or an error occurs.
    74     74   #
    75         -for {set iRun 0} {[clock seconds] < $soak_finishtime} {incr iRun} {
           75  +for {set iRun 0} {[clock_seconds] < $soak_finishtime} {incr iRun} {
    76     76   
    77     77     set iIdx [expr {$iRun % [llength $SOAKTESTS]}]
    78     78     source [file join $testdir [lindex $SOAKTESTS $iIdx]]
    79     79     catch {db close}
    80     80   
    81     81     if {$sqlite_open_file_count>0} {
    82     82       puts "$tail did not close all files: $sqlite_open_file_count"