Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Fix for test issues when there is no current directory support due to being compiled for WinRT. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | winrt |
Files: | files | file ages | folders |
SHA1: |
a811cb01528beab8afd899411d187d4d |
User & Date: | mistachkin 2012-03-06 03:00:49.815 |
Context
2012-03-07
| ||
16:52 | Merge in the latest trunk changes. (check-in: ca4708531a user: drh tags: winrt) | |
2012-03-06
| ||
03:00 | Fix for test issues when there is no current directory support due to being compiled for WinRT. (check-in: a811cb0152 user: mistachkin tags: winrt) | |
2012-03-05
| ||
22:52 | Add compile-time define to indicate if the VFS supports the concept of a current directory (as WinCE and WinRT do not). Avoid using the GetTempPath and GetFullPathName APIs on WinRT. Some tests still need adjustments. (check-in: 86c049a171 user: mistachkin tags: winrt) | |
Changes
Changes to test/e_uri.test.
︙ | ︙ | |||
127 128 129 130 131 132 133 | # EVIDENCE-OF: R-17482-00398 If the authority is not an empty string or # "localhost", an error is returned to the caller. # if {$tcl_platform(platform) == "unix"} { set flags [list SQLITE_OPEN_READWRITE SQLITE_OPEN_CREATE SQLITE_OPEN_URI] foreach {tn uri error} " | | | | | | | | | | 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 | # EVIDENCE-OF: R-17482-00398 If the authority is not an empty string or # "localhost", an error is returned to the caller. # if {$tcl_platform(platform) == "unix"} { set flags [list SQLITE_OPEN_READWRITE SQLITE_OPEN_CREATE SQLITE_OPEN_URI] foreach {tn uri error} " 1 {file://localhost[test_pwd /]test.db} {not an error} 2 {file://[test_pwd /]test.db} {not an error} 3 {file://x[test_pwd /]test.db} {invalid uri authority: x} 4 {file://invalid[test_pwd /]test.db} {invalid uri authority: invalid} " { do_test 2.$tn { set DB [sqlite3_open_v2 $uri $flags ""] set e [sqlite3_errmsg $DB] sqlite3_close $DB set e } $error } } # EVIDENCE-OF: R-45981-25528 The fragment component of a URI, if # present, is ignored. # # It is difficult to test that something is ignored correctly. So these tests # just show that adding a fragment does not interfere with the pathname or # parameters passed through to the VFS xOpen() methods. # foreach {tn uri parse} " 1 {file:test.db#abc} {[test_pwd / {}]test.db {}} 2 {file:test.db?a=b#abc} {[test_pwd / {}]test.db {a b}} 3 {file:test.db?a=b#?c=d} {[test_pwd / {}]test.db {a b}} " { do_filepath_test 3.$tn { parse_uri $uri } $parse } # EVIDENCE-OF: R-62557-09390 SQLite uses the path component of the URI # as the name of the disk file which contains the database. # # EVIDENCE-OF: R-28659-11035 If the path begins with a '/' character, # then it is interpreted as an absolute path. # # EVIDENCE-OF: R-46234-61323 If the path does not begin with a '/' # (meaning that the authority section is omitted from the URI) then the # path is interpreted as a relative path. # foreach {tn uri parse} " 1 {file:test.db} {[test_pwd / {}]test.db {}} 2 {file:/test.db} {/test.db {}} 3 {file:///test.db} {/test.db {}} 4 {file://localhost/test.db} {/test.db {}} 5 {file:/a/b/c/test.db} {/a/b/c/test.db {}} " { do_filepath_test 4.$tn { parse_uri $uri } $parse } |
︙ | ︙ |
Changes to test/quota.test.
︙ | ︙ | |||
8 9 10 11 12 13 14 15 16 17 18 19 20 21 | # May you share freely, never taking more than you give. # #*********************************************************************** # set testdir [file dirname $argv0] source $testdir/tester.tcl source $testdir/malloc_common.tcl unset -nocomplain defaultVfs set defaultVfs [file_control_vfsname db] db close do_test quota-1.1 { sqlite3_quota_initialize nosuchvfs 1 } {SQLITE_ERROR} | > > > > > > > | 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 | # May you share freely, never taking more than you give. # #*********************************************************************** # set testdir [file dirname $argv0] source $testdir/tester.tcl # If SQLITE_CURDIR is not defined, omit this file. ifcapable !curdir { finish_test return } source $testdir/malloc_common.tcl unset -nocomplain defaultVfs set defaultVfs [file_control_vfsname db] db close do_test quota-1.1 { sqlite3_quota_initialize nosuchvfs 1 } {SQLITE_ERROR} |
︙ | ︙ |
Changes to test/quota2.test.
︙ | ︙ | |||
8 9 10 11 12 13 14 15 16 17 18 19 20 21 | # May you share freely, never taking more than you give. # #*********************************************************************** # set testdir [file dirname $argv0] source $testdir/tester.tcl source $testdir/malloc_common.tcl db close sqlite3_quota_initialize "" 1 foreach dir {quota2a/x1 quota2a/x2 quota2a quota2b quota2c} { file delete -force $dir | > > > > > > > | 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 | # May you share freely, never taking more than you give. # #*********************************************************************** # set testdir [file dirname $argv0] source $testdir/tester.tcl # If SQLITE_CURDIR is not defined, omit this file. ifcapable !curdir { finish_test return } source $testdir/malloc_common.tcl db close sqlite3_quota_initialize "" 1 foreach dir {quota2a/x1 quota2a/x2 quota2a quota2b quota2c} { file delete -force $dir |
︙ | ︙ |
Changes to test/shared.test.
︙ | ︙ | |||
900 901 902 903 904 905 906 | DELETE FROM abc WHERE 1; } lappend res $I $II } set res } {1 4 {} 7} if {[llength [info command sqlite3_shared_cache_report]]==1} { | > | | | > | 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 | DELETE FROM abc WHERE 1; } lappend res $I $II } set res } {1 4 {} 7} if {[llength [info command sqlite3_shared_cache_report]]==1} { ifcapable curdir { do_test shared-$av.11.9 { string tolower [sqlite3_shared_cache_report] } [string tolower [list [file nativename [file normalize test.db]] 2]] } } do_test shared-$av.11.11 { db close db2 close } {} |
︙ | ︙ |
Changes to test/tester.tcl.
︙ | ︙ | |||
16 17 18 19 20 21 22 23 24 25 26 27 28 29 | #------------------------------------------------------------------------- # The commands provided by the code in this file to help with creating # test cases are as follows: # # Commands to manipulate the db and the file-system at a high level: # # is_relative_file # copy_file FROM TO # delete_file FILENAME # drop_all_tables ?DB? # forcecopy FROM TO # forcedelete FILENAME # # Test the capability of the SQLite version built into the interpreter to | > | 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 | #------------------------------------------------------------------------- # The commands provided by the code in this file to help with creating # test cases are as follows: # # Commands to manipulate the db and the file-system at a high level: # # is_relative_file # test_pwd # copy_file FROM TO # delete_file FILENAME # drop_all_tables ?DB? # forcecopy FROM TO # forcedelete FILENAME # # Test the capability of the SQLite version built into the interpreter to |
︙ | ︙ | |||
195 196 197 198 199 200 201 202 203 204 205 206 207 208 | } # Check if a file name is relative # proc is_relative_file { file } { return [expr {[file pathtype $file] != "absolute"}] } # Delete a file or directory # proc delete_file {args} { do_delete_file false {*}$args } | > > > > > > > > > > > > > > > > > > > > > > | 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 | } # Check if a file name is relative # proc is_relative_file { file } { return [expr {[file pathtype $file] != "absolute"}] } # If the VFS supports using the current directory, returns [pwd]; # otherwise, it returns only the provided suffix string (which is # empty by default). # proc test_pwd { args } { if {[llength $args] > 0} { set suffix1 [lindex $args 0] if {[llength $args] > 1} { set suffix2 [lindex $args 1] } else { set suffix2 $suffix1 } } else { set suffix1 ""; set suffix2 "" } ifcapable curdir { return "[pwd]$suffix1" } else { return $suffix2 } } # Delete a file or directory # proc delete_file {args} { do_delete_file false {*}$args } |
︙ | ︙ |
Changes to test/uri.test.
︙ | ︙ | |||
48 49 50 51 52 53 54 55 56 | 13 file:test.db%00extra test.db 14 file:testdb%00.db%00extra testdb 15 test.db?mork=1#boris test.db?mork=1#boris 16 file://localhostPWD/test.db%3Fhello test.db?hello } { if {$tcl_platform(platform)=="windows"} { if {$tn>14} break | > > > > | < | < | 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 | 13 file:test.db%00extra test.db 14 file:testdb%00.db%00extra testdb 15 test.db?mork=1#boris test.db?mork=1#boris 16 file://localhostPWD/test.db%3Fhello test.db?hello } { ifcapable !curdir { if {$tn==3} break } if {$tcl_platform(platform)=="windows"} { if {$tn>14} break } set uri [string map [list PWD/ [test_pwd /]] $uri] if {[file isdir $file]} {error "$file is a directory"} forcedelete $file do_test 1.$tn.1 { file exists $file } 0 set DB [sqlite3_open $uri] do_test 1.$tn.2 { file exists $file } 1 sqlite3_close $DB |
︙ | ︙ |