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: |
53cd91d00594f1bd7c0a565a35ec9cac |
| 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
Changes to src/test_onefile.c.
556 557 558 559 560 561 562 563 564 565 566 567 568 569 |
return SQLITE_OK;
}
/*
** File control method. For custom operations on an fs-file.
*/
static int fsFileControl(sqlite3_file *pFile, int op, void *pArg){
return SQLITE_OK;
}
/*
** Return the sector-size in bytes for an fs-file.
*/
static int fsSectorSize(sqlite3_file *pFile){
|
> |
556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 |
return SQLITE_OK;
}
/*
** File control method. For custom operations on an fs-file.
*/
static int fsFileControl(sqlite3_file *pFile, int op, void *pArg){
if( op==SQLITE_FCNTL_PRAGMA ) return SQLITE_NOTFOUND;
return SQLITE_OK;
}
/*
** Return the sector-size in bytes for an fs-file.
*/
static int fsSectorSize(sqlite3_file *pFile){
|
Changes to test/permutations.test.
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
....
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
|
foreach {k v} $args {
set o [array names options ${k}*]
if {[llength $o]>1} { error "ambiguous option: $k" }
if {[llength $o]==0} { error "unknown option: $k" }
set options([lindex $o 0]) $v
}
# Transform "-presql" into a "dbconfig" script
#
if {[info exists options(-presql)]} {
append options(-dbconfig) "\n\$::dbhandle eval { $options(-presql) }"
unset options(-presql)
}
set ::testspec($name) [array get options]
lappend ::testsuitelist $name
}
#-------------------------------------------------------------------------
# test_set ARGS...
#
................................................................................
# -dbconfig SCRIPT
#
proc run_tests {name args} {
set options(-initialize) ""
set options(-shutdown) ""
set options(-prefix) ""
set options(-dbconfig) ""
array set options $args
set ::G(perm:name) $name
set ::G(perm:prefix) $options(-prefix)
set ::G(isquick) 1
set ::G(perm:dbconfig) $options(-dbconfig)
foreach file [lsort $options(-files)] {
uplevel $options(-initialize)
if {[file tail $file] == $file} { set file [file join $::testdir $file] }
slave_test_file $file
uplevel $options(-shutdown)
unset -nocomplain ::G(perm:sqlite3_args)
}
unset ::G(perm:name)
unset ::G(perm:prefix)
unset ::G(perm:dbconfig)
}
proc run_test_suite {name} {
if {[info exists ::testspec($name)]==0} {
error "No such test suite: $name"
}
uplevel run_tests $name $::testspec($name)
|
<
<
<
<
<
<
<
>
>
>
|
44
45
46
47
48
49
50
51
52
53
54
55
56
57
....
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
|
foreach {k v} $args {
set o [array names options ${k}*]
if {[llength $o]>1} { error "ambiguous option: $k" }
if {[llength $o]==0} { error "unknown option: $k" }
set options([lindex $o 0]) $v
}
set ::testspec($name) [array get options]
lappend ::testsuitelist $name
}
#-------------------------------------------------------------------------
# test_set ARGS...
#
................................................................................
# -dbconfig SCRIPT
#
proc run_tests {name args} {
set options(-initialize) ""
set options(-shutdown) ""
set options(-prefix) ""
set options(-dbconfig) ""
set options(-presql) ""
array set options $args
set ::G(perm:name) $name
set ::G(perm:prefix) $options(-prefix)
set ::G(isquick) 1
set ::G(perm:dbconfig) $options(-dbconfig)
set ::G(perm:presql) $options(-presql)
foreach file [lsort $options(-files)] {
uplevel $options(-initialize)
if {[file tail $file] == $file} { set file [file join $::testdir $file] }
slave_test_file $file
uplevel $options(-shutdown)
unset -nocomplain ::G(perm:sqlite3_args)
}
unset ::G(perm:name)
unset ::G(perm:prefix)
unset ::G(perm:dbconfig)
unset ::G(perm:presql)
}
proc run_test_suite {name} {
if {[info exists ::testspec($name)]==0} {
error "No such test suite: $name"
}
uplevel run_tests $name $::testspec($name)
|