/ Check-in [53cd91d0]
Login

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

Overview
Comment:Merge latest trunk changes into this branch.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | changesetfuzz
Files: files | file ages | folders
SHA3-256: 53cd91d00594f1bd7c0a565a35ec9cac3095a583022d6211158a369e942257b0
User & Date: dan 2018-11-07 20:13:45
Context
2018-11-08
14:59
Add tests and a fix for program "changesetfuzz". check-in: 09b90db5 user: dan tags: changesetfuzz
2018-11-07
20:13
Merge latest trunk changes into this branch. check-in: 53cd91d0 user: dan tags: changesetfuzz
20:07
Fix minor issues in the changesetfuzz program. check-in: 5c7f0240 user: dan tags: changesetfuzz
14:39
Fix a problem with the handling of SQLITE_FCNTL_PRAGMA in the test_onefile.c demo. check-in: 13e21b7d user: dan tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/test_onefile.c.

   556    556     return SQLITE_OK;
   557    557   }
   558    558   
   559    559   /*
   560    560   ** File control method. For custom operations on an fs-file.
   561    561   */
   562    562   static int fsFileControl(sqlite3_file *pFile, int op, void *pArg){
          563  +  if( op==SQLITE_FCNTL_PRAGMA ) return SQLITE_NOTFOUND;
   563    564     return SQLITE_OK;
   564    565   }
   565    566   
   566    567   /*
   567    568   ** Return the sector-size in bytes for an fs-file.
   568    569   */
   569    570   static int fsSectorSize(sqlite3_file *pFile){

Changes to test/permutations.test.

    44     44     foreach {k v} $args {
    45     45       set o [array names options ${k}*]
    46     46       if {[llength $o]>1}  { error "ambiguous option: $k" }
    47     47       if {[llength $o]==0} { error "unknown option: $k" }
    48     48       set options([lindex $o 0]) $v
    49     49     }
    50     50   
    51         -  # Transform "-presql" into a "dbconfig" script
    52         -  #
    53         -  if {[info exists options(-presql)]} {
    54         -    append options(-dbconfig) "\n\$::dbhandle eval { $options(-presql) }"
    55         -    unset options(-presql)
    56         -  }
    57         -
    58     51     set     ::testspec($name) [array get options]
    59     52     lappend ::testsuitelist $name
    60     53   }
    61     54   
    62     55   #-------------------------------------------------------------------------
    63     56   # test_set ARGS...
    64     57   #
................................................................................
  1086   1079   #       -dbconfig    SCRIPT
  1087   1080   #
  1088   1081   proc run_tests {name args} {
  1089   1082     set options(-initialize) ""
  1090   1083     set options(-shutdown) ""
  1091   1084     set options(-prefix) ""
  1092   1085     set options(-dbconfig) ""
         1086  +  set options(-presql) ""
  1093   1087   
  1094   1088     array set options $args
  1095   1089   
  1096   1090     set ::G(perm:name)         $name
  1097   1091     set ::G(perm:prefix)       $options(-prefix)
  1098   1092     set ::G(isquick)           1
  1099   1093     set ::G(perm:dbconfig)     $options(-dbconfig)
         1094  +  set ::G(perm:presql)       $options(-presql)
  1100   1095   
  1101   1096     foreach file [lsort $options(-files)] {
  1102   1097       uplevel $options(-initialize)
  1103   1098       if {[file tail $file] == $file} { set file [file join $::testdir $file] }
  1104   1099       slave_test_file $file
  1105   1100       uplevel $options(-shutdown)
  1106   1101   
  1107   1102       unset -nocomplain ::G(perm:sqlite3_args)
  1108   1103     }
  1109   1104   
  1110   1105     unset ::G(perm:name)
  1111   1106     unset ::G(perm:prefix)
  1112   1107     unset ::G(perm:dbconfig)
         1108  +  unset ::G(perm:presql)
  1113   1109   }
  1114   1110   
  1115   1111   proc run_test_suite {name} {
  1116   1112     if {[info exists ::testspec($name)]==0} {
  1117   1113       error "No such test suite: $name"
  1118   1114     }
  1119   1115     uplevel run_tests $name $::testspec($name)