1
0
mirror of https://github.com/sqlite/sqlite.git synced 2025-07-30 19:03:16 +03:00

Merge and manually resolve testing updates from trunk.

FossilOrigin-Name: 5eecdb44dd809e91002b8ecf59ada72f4b56549a
This commit is contained in:
mistachkin
2012-03-08 20:22:42 +00:00
21 changed files with 74 additions and 47 deletions

View File

@ -524,7 +524,7 @@ db close
# 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
@ -1019,7 +1019,7 @@ do_test pager1-5.4.1 {
# 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
@ -1047,7 +1047,7 @@ do_test pager1-5.4.2 {
# 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