From: mistachkin Date: Thu, 8 Mar 2012 20:22:42 +0000 (+0000) Subject: Merge and manually resolve testing updates from trunk. X-Git-Tag: version-3.7.13~11^2~37 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6aa18c95f1dba0e91a3e2554e851db14cfe1ae8b;p=thirdparty%2Fsqlite.git Merge and manually resolve testing updates from trunk. FossilOrigin-Name: 5eecdb44dd809e91002b8ecf59ada72f4b56549a --- 6aa18c95f1dba0e91a3e2554e851db14cfe1ae8b diff --cc manifest index 930e43b823,0722c0bf60..0b76c88dc2 --- a/manifest +++ b/manifest @@@ -1,10 -1,10 +1,10 @@@ - C When\scompiled\sfor\sWinRT,\suse\sthe\sCreateFile2\sand\sLoadPackagedLibrary\sfunctions\sinstead\sof\sCreateFile\sand\sLoadLibrary. - D 2012-03-07T20:11:47.006 -C On\sWindows,\smake\ssure\sthe\scurrent\sdirectory\svalue\sused\sby\sthe\stest\ssuite\sis\s'normalized'\sto\swhat\sthe\sparent\scommand\sshell\ssees.\s\sAlso,\sclean\sthe\stest\sdirectories\sused\sby\sthe\squota2.test\sfile. -D 2012-03-08T20:00:36.181 ++C Merge\sand\smanually\sresolve\stesting\supdates\sfrom\strunk. ++D 2012-03-08T20:22:42.680 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f - F Makefile.in 3f79a373e57c3b92dabf76f40b065e719d31ac34 + F Makefile.in 2f37e468503dbe79d35c9f6dffcf3fae1ae9ec20 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 - F Makefile.msc 2aa54dceaafea890a19cd7f06ac7c168aff669d8 - F Makefile.vxworks 1deb39c8bb047296c30161ffa10c1b5423e632f9 -F Makefile.msc 7849a871b6cdb20fd51baee6bbe5965a03326be4 ++F Makefile.msc c8e27f878adc9aa70682b9aa986e02e9d597b8d0 + F Makefile.vxworks 3b7fe7a0571fdadc61363ebc1b23732d2d6363ca F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6 F VERSION bb4c2a86abe53ea3c1d6ea515b69a426040e2414 F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50 @@@ -296,8 -296,8 +296,8 @@@ F test/backup_malloc.test 7162d604ec2b4 F test/badutf.test d5360fc31f643d37a973ab0d8b4fb85799c3169f F test/badutf2.test f5bc7f2d280670ecd79b9cf4f0f1760c607fe51f F test/between.test 16b1776c6323faadb097a52d673e8e3d8be7d070 - F test/bigfile.test 40922053e5fa37b5e1277183d8392d7ce9fe632f - F test/bigfile2.test 284026c778fcb97d16a4438c921458ad6e2ecd09 -F test/bigfile.test 82dfe93ee7eb9e2e05641afa2b39ffd947a92ff1 -F test/bigfile2.test 852f948cb492aadab45b58f4d2f3b0832a115cb0 ++F test/bigfile.test 8f88b5ef065e31c615c49d725ede94155fbe9609 ++F test/bigfile2.test 8a3c242c3c3481e7cde5a6ef2a66fdc367a095f7 F test/bigrow.test f0aeb7573dcb8caaafea76454be3ade29b7fc747 F test/bind.test 3c7b320969000c441a70952b0b15938fbb66237c F test/bindxfer.test efecd12c580c14df5f4ad3b3e83c667744a4f7e0 @@@ -625,7 -625,7 +625,7 @@@ F test/notnull.test cc7c78340328e6112a1 F test/null.test a8b09b8ed87852742343b33441a9240022108993 F test/openv2.test 0d3040974bf402e19b7df4b783e447289d7ab394 F test/oserror.test 50417780d0e0d7cd23cf12a8277bb44024765df3 - F test/pager1.test a306c33e6fbc4d0e5e22529381226fb71d2bef43 -F test/pager1.test 101032cb9d8093806600b343fdcf78ba51c1e3e9 ++F test/pager1.test 4be3dacf48b767929112626be1b358a7f84e0eae F test/pager2.test 745b911dde3d1f24ae0870bd433dfa83d7c658c1 F test/pager3.test 3856d9c80839be0668efee1b74811b1b7f7fc95f F test/pagerfault.test 452f2cc23e3bfcfa935f4442aec1da4fe1dc0442 @@@ -643,8 -643,8 +643,8 @@@ F test/progress.test 5b075c3c790c7b2a61 F test/ptrchng.test ef1aa72d6cf35a2bbd0869a649b744e9d84977fc F test/quick.test 1681febc928d686362d50057c642f77a02c62e57 F test/quota-glob.test 32901e9eed6705d68ca3faee2a06b73b57cb3c26 - F test/quota.test 6911189e2854b7a30420af284fb096e650683f7c - F test/quota2.test 964ef836996cb512a1cb29aee4dbb4874544fb0d -F test/quota.test c2f778dab4c7fb07bcfa962cc5c762f36d8061dc -F test/quota2.test 7e1c84f71f59388963fa8181a1292c87ae814d2d ++F test/quota.test b5b3eec55a059e0fe493c66c6e27bd2c07676cfd ++F test/quota2.test 8ce58614614cd2b4eb70cd378e616811aed7b34e F test/quote.test 215897dbe8de1a6f701265836d6601cc6ed103e6 F test/randexpr1.tcl 40dec52119ed3a2b8b2a773bce24b63a3a746459 F test/randexpr1.test eda062a97e60f9c38ae8d806b03b0ddf23d796df @@@ -719,7 -719,7 +719,7 @@@ F test/tclsqlite.test 1597d353308531527 F test/tempdb.test 19d0f66e2e3eeffd68661a11c83ba5e6ace9128c F test/temptable.test 51edd31c65ed1560dd600b1796e8325df96318e2 F test/temptrigger.test 26670ed7a39cf2296a7f0a9e0a1d7bdb7abe936d - F test/tester.tcl 89ff87968ca1f8101c2ea5dfae430ccd6ec69cad -F test/tester.tcl 1fd85b1f508eab104085427c2c4b77c81ad5adb6 ++F test/tester.tcl b443ad34242882018924a70fc87fca6f4c64953f F test/thread001.test 7cc2ce08f9cde95964736d11e91f9ab610f82f91 F test/thread002.test e630504f8a06c00bf8bbe68528774dd96aeb2e58 F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7 @@@ -880,7 -880,7 +880,7 @@@ F test/unique.test 083c7fff74695bcc27a7 F test/unixexcl.test a9870e46cc6f8390a494513d4f2bf55b5a8b3e46 F test/unordered.test f53095cee37851bf30130fa1bf299a8845e837bb F test/update.test 8bc86fd7ef1a00014f76dc6a6a7c974df4aef172 - F test/uri.test 7ef16ff2213177c5e44f57b8dda75fa363eeb2d2 -F test/uri.test 78e869db1ff6331157b08ef089b1b3e65819c74c ++F test/uri.test c23abcb4c4c762b2a57f2d330ede9522de081835 F test/utf16align.test 54cd35a27c005a9b6e7815d887718780b6a462ae F test/vacuum.test ce91c39f7f91a4273bf620efad21086b5aa6ef1d F test/vacuum2.test af432e6e3bfc0ea20a80cb86a03c7d9876d38324 @@@ -907,7 -907,7 +907,7 @@@ F test/vtabF.test fd5ad376f5a34fe0891df F test/vtab_alter.test 9e374885248f69e251bdaacf480b04a197f125e5 F test/vtab_err.test 0d4d8eb4def1d053ac7c5050df3024fd47a3fbd8 F test/vtab_shared.test 82f463886e18d7f8395a4b6167c91815efe54839 - F test/wal.test 396be04083914d3a2970d4a494e321545026c6e2 -F test/wal.test 2fbf4bbd0cb03aff6ada8150f29808c79370d50b ++F test/wal.test 99394a4c0310a1a44693512ce620f1b73dafd3ec F test/wal2.test 8871e7fd2c86711ff415a5817d68ea3101a15312 F test/wal3.test 6504bbf348b2d6dfade64a064f1050fd617e8706 F test/wal4.test 4744e155cd6299c6bd99d3eab1c82f77db9cdb3c @@@ -992,7 -992,7 +992,7 @@@ F tool/tostr.awk e75472c2f98dd76e06b8c9 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381 - P ca4708531a5e0debbe3d0999a4d210ef2a347972 - R a847917f3cb0516bcd40d98583b4bef4 -P b00ccda307caae597c143ab0586f90acb77f79cf -R 73d2728d68d6731f1970faf64d7b9793 ++P 27d6942ca270d6e724ffd230ed58a8683d67dfa4 82bcd7ec1531f6d71c079578434c58d3ce46a1de ++R caba4c03942074fd6664aa09d852cc9e U mistachkin - Z f23820be67631a5e2a405c3799a1a747 -Z 6e64cf730fea76ed50d0faa61eface55 ++Z 3683990d956f3e16ca5627ca9508a920 diff --cc manifest.uuid index 173aa9cec6,64173e4574..ffd1242f8b --- a/manifest.uuid +++ b/manifest.uuid @@@ -1,1 -1,1 +1,1 @@@ - 27d6942ca270d6e724ffd230ed58a8683d67dfa4 -82bcd7ec1531f6d71c079578434c58d3ce46a1de ++5eecdb44dd809e91002b8ecf59ada72f4b56549a diff --cc test/pager1.test index 1a21f36f31,3f3c12c541..d9c13c20c4 --- a/test/pager1.test +++ b/test/pager1.test @@@ -524,7 -524,6 +524,7 @@@ db clos # file-system is saved just before the xDelete() call to remove the # master journal file from the file-system. # - set pwd [pwd] ++set pwd [get_pwd] testvfs tv -default 1 tv script copy_on_mj_delete set ::mj_filename_length 0 @@@ -1010,17 -1001,8 +1010,17 @@@ do_test pager1-5.4.1 # the master-journal name encoded as utf-8 with no nul term. # set mj_pointer [expr { - 20 + [string length [get_pwd]] + [string length "/test.db-mjXXXXXX9XX"] + 20 + [string length "test.db-mjXXXXXX9XX"] }] + # + # NOTE: For item 3 above, if the current SQLite VFS lacks the concept of a + # current directory, the length of the current directory name plus 1 + # character for the directory separator character are NOT counted as + # part of the total size; otherwise, they are. + # + ifcapable curdir { - set mj_pointer [expr {$mj_pointer + [string length [pwd]] + 1}] ++ set mj_pointer [expr {$mj_pointer + [string length [get_pwd]] + 1}] + } expr {$::max_journal==(512+2*(1024+8)+$mj_pointer)} } 1 do_test pager1-5.4.2 { @@@ -1038,17 -1020,8 +1038,17 @@@ # written starting at the next (in this case 512 byte) sector boundary. # set mj_pointer [expr { - 20 + [string length [get_pwd]] + [string length "/test.db-mjXXXXXX9XX"] + 20 + [string length "test.db-mjXXXXXX9XX"] }] + # + # NOTE: If the current SQLite VFS lacks the concept of a current directory, + # the length of the current directory name plus 1 character for the + # directory separator character are NOT counted as part of the total + # size; otherwise, they are. + # + ifcapable curdir { - set mj_pointer [expr {$mj_pointer + [string length [pwd]] + 1}] ++ set mj_pointer [expr {$mj_pointer + [string length [get_pwd]] + 1}] + } expr {$::max_journal==(((512+2*(1024+8)+511)/512)*512 + $mj_pointer)} } 1 db close diff --cc test/tester.tcl index b819610d15,a1b61a7ae9..4e7526cef0 --- a/test/tester.tcl +++ b/test/tester.tcl @@@ -19,8 -19,7 +19,9 @@@ # # Commands to manipulate the db and the file-system at a high level: # +# is_relative_file +# test_pwd + # get_pwd # copy_file FROM TO # delete_file FILENAME # drop_all_tables ?DB? @@@ -195,34 -206,6 +208,34 @@@ proc do_copy_file {force from to} } } +# 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" ++ return "[get_pwd]$suffix1" + } else { + return $suffix2 + } +} + # Delete a file or directory # proc delete_file {args} { diff --cc test/wal.test index 75debb21b5,9d2c6b14b4..d488026c3e --- a/test/wal.test +++ b/test/wal.test @@@ -1477,11 -1477,7 +1477,11 @@@ foreach pgsz {512 1024 2048 4096 8192 1 # Test that when 1 or more pages are recovered from a WAL file, # sqlite3_log() is invoked to report this to the user. # -set walfile [file nativename [file join [get_pwd] test.db-wal]] +ifcapable curdir { - set walfile [file nativename [file join [pwd] test.db-wal]] ++ set walfile [file nativename [file join [get_pwd] test.db-wal]] +} else { + set walfile test.db-wal +} catch {db close} forcedelete test.db do_test wal-23.1 {