/ Check-in [3a245a83]
Login

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

Overview
Comment:Merge updates from trunk.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | winOsTrace
Files: files | file ages | folders
SHA1: 3a245a832d4843802c3c57f8cda3e4e1d0d52622
User & Date: mistachkin 2013-04-29 08:56:49
Context
2013-04-29
08:58
Adjust a WAL test result due to changes in the corresponding return code name. check-in: 9272009f user: mistachkin tags: winOsTrace
08:56
Merge updates from trunk. check-in: 3a245a83 user: mistachkin tags: winOsTrace
07:01
Update 'fuzzerfault' test for its new module loading command. Fix several test names in 'io.test' and make sure the database gets closed between tests. check-in: e81e9ca1 user: mistachkin tags: trunk
03:09
More refinements to Windows OSTRACE usage. Replace all usage of sqlite3TestErrorName() with sqlite3ErrName() and add missing return codes. check-in: 05ba5e23 user: mistachkin tags: winOsTrace
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to test/fuzzerfault.test.

    26     26       INSERT INTO x1_rules VALUES(0, 'a', 'c', 2);
    27     27       INSERT INTO x1_rules VALUES(0, 'a', 'd', 3);
    28     28     }
    29     29     faultsim_save_and_close
    30     30   } {}
    31     31   do_faultsim_test 1 -prep {
    32     32     faultsim_restore_and_reopen
    33         -  register_fuzzer_module db
           33  +  load_static_extension db fuzzer
    34     34   } -body {
    35     35     execsql { 
    36     36       CREATE VIRTUAL TABLE x1 USING fuzzer(x1_rules);
    37     37       SELECT word FROM x1 WHERE word MATCH 'xax';
    38     38     }
    39     39   } -test {
    40     40     faultsim_test_result {0 {xax xbx xcx xdx}}               \
    41     41                          {1 {vtable constructor failed: x1}}
    42     42   }
    43     43   
    44     44   do_test 2-pre1 {
    45     45     faultsim_delete_and_reopen
    46         -  register_fuzzer_module db
           46  +  load_static_extension db fuzzer
    47     47     execsql {
    48     48       CREATE TABLE x2_rules(ruleset, cFrom, cTo, cost);
    49     49       INSERT INTO x2_rules VALUES(0, 'a', 'x', 1);
    50     50       INSERT INTO x2_rules VALUES(0, 'b', 'x', 2);
    51     51       INSERT INTO x2_rules VALUES(0, 'c', 'x', 3);
    52     52       CREATE VIRTUAL TABLE x2 USING fuzzer(x2_rules);
    53     53     }
    54     54     faultsim_save_and_close
    55     55   } {}
    56     56   
    57     57   do_faultsim_test 2 -prep {
    58     58     faultsim_restore_and_reopen
    59         -  register_fuzzer_module db
           59  +  load_static_extension db fuzzer
    60     60   } -body {
    61     61     execsql { 
    62     62       SELECT count(*) FROM x2 WHERE word MATCH 'abc';
    63     63     }
    64     64   } -test {
    65     65     faultsim_test_result {0 8} {1 {vtable constructor failed: x2}}
    66     66   }
................................................................................
    74     74       );
    75     75     }
    76     76     faultsim_save_and_close
    77     77   } {}
    78     78   
    79     79   do_faultsim_test 3 -prep {
    80     80     faultsim_restore_and_reopen
    81         -  register_fuzzer_module db
           81  +  load_static_extension db fuzzer
    82     82   } -body {
    83     83     execsql { 
    84     84       CREATE VIRTUAL TABLE x1 USING fuzzer(x1_rules);
    85     85       SELECT count(*) FROM (SELECT * FROM x1 WHERE word MATCH 'a' LIMIT 2);
    86     86     }
    87     87   } -test {
    88     88     faultsim_test_result {0 2} {1 {vtable constructor failed: x1}}
    89     89   }
    90     90   
    91     91   
    92     92   finish_test

Changes to test/io.test.

    12     12   # The focus of this file is testing some specific characteristics of the 
    13     13   # IO traffic generated by SQLite (making sure SQLite is not writing out
    14     14   # more database pages than it has to, stuff like that).
    15     15   #
    16     16   
    17     17   set testdir [file dirname $argv0]
    18     18   source $testdir/tester.tcl
           19  +set ::testprefix io
    19     20   
    20     21   db close
    21     22   sqlite3_simulate_device
    22     23   sqlite3 db test.db -vfs devsym
    23     24   
    24     25   # Test summary:
    25     26   #
................................................................................
   624    625     # Corrupt the database file on disk. This should not matter for the
   625    626     # purposes of the following "PRAGMA integrity_check", as the entire
   626    627     # database should be cached in the pager-cache. If corruption is
   627    628     # reported, it indicates that executing $sql caused the pager cache
   628    629     # to be flushed. Which is a bug.
   629    630     hexio_write test.db [expr 1024 * 5] [string repeat 00 2048]
   630    631     do_execsql_test 6.2.$tn.3 { PRAGMA integrity_check } {ok}
          632  +  db close
   631    633   }
   632    634   
   633    635   sqlite3_simulate_device -char {} -sectorsize 0
   634    636   finish_test
   635    637