mirror of
https://github.com/sqlite/sqlite.git
synced 2025-08-08 14:02:16 +03:00
Merge the latest trunk enhancements into the wal2 branch.
FossilOrigin-Name: c68d0d353082a5810a48f01637d642bcdfd9f03dd244e0618fc0d7cf5f7b9b12
This commit is contained in:
@@ -814,7 +814,7 @@ proc do_test {name cmd expected} {
|
||||
# on Windows because of issues with ANSI and UTF8 I/O on Win11.
|
||||
#
|
||||
proc do_test_with_ansi_output {name cmd expected} {
|
||||
if {![info exists ::SLAVE] || $::tcl_platform(platform)!="windows"} {
|
||||
if {![info exists ::SLAVE] || $::tcl_platform(platform) ne "windows"} {
|
||||
uplevel 1 [list do_test $name $cmd $expected]
|
||||
}
|
||||
}
|
||||
@@ -873,7 +873,7 @@ proc catchcmdex {db {cmd ""}} {
|
||||
|
||||
proc filepath_normalize {p} {
|
||||
# test cases should be written to assume "unix"-like file paths
|
||||
if {$::tcl_platform(platform)!="unix"} {
|
||||
if {$::tcl_platform(platform) ne "unix"} {
|
||||
string map [list \\ / \{/ / .db\} .db] \
|
||||
[regsub -nocase -all {[a-z]:[/\\]+} $p {/}]
|
||||
} {
|
||||
@@ -1833,7 +1833,7 @@ proc crashsql {args} {
|
||||
# error message. We map that to the expected message
|
||||
# so that we don't have to change all of the test
|
||||
# cases.
|
||||
if {$::tcl_platform(platform)=="windows"} {
|
||||
if {$::tcl_platform(platform) eq "windows"} {
|
||||
if {$msg=="child killed: unknown signal"} {
|
||||
set msg "child process exited abnormally"
|
||||
}
|
||||
@@ -1884,7 +1884,7 @@ proc crash_on_write {args} {
|
||||
# error message. We map that to the expected message
|
||||
# so that we don't have to change all of the test
|
||||
# cases.
|
||||
if {$::tcl_platform(platform)=="windows"} {
|
||||
if {$::tcl_platform(platform) eq "windows"} {
|
||||
if {$msg=="child killed: unknown signal"} {
|
||||
set msg "child process exited abnormally"
|
||||
}
|
||||
@@ -2548,7 +2548,7 @@ proc test_restore_config_pagecache {} {
|
||||
}
|
||||
|
||||
proc test_binary_name {nm} {
|
||||
if {$::tcl_platform(platform)=="windows"} {
|
||||
if {$::tcl_platform(platform) eq "windows"} {
|
||||
set ret "$nm.exe"
|
||||
} else {
|
||||
set ret $nm
|
||||
|
Reference in New Issue
Block a user