1
0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-07 02:42:48 +03:00

Merge recent trunk enhancements into the wal2 branch.

FossilOrigin-Name: 7e2bc836f6aedfd69588f5723f8797f11ee6437d3b63ffc43c88d40e3baadb1c
This commit is contained in:
drh
2021-10-21 14:01:05 +00:00
84 changed files with 1790 additions and 1770 deletions

View File

@@ -1204,14 +1204,29 @@ proc speed_trial_summary {name} {
}
}
# Clear out left-over configuration setup from the end of a test
#
proc finish_test_precleanup {} {
catch {db1 close}
catch {db2 close}
catch {db3 close}
catch {unregister_devsim}
catch {unregister_jt_vfs}
catch {unregister_demovfs}
}
# Run this routine last
#
proc finish_test {} {
global argv
finish_test_precleanup
if {[llength $argv]>0} {
# If additional test scripts are specified on the command-line,
# run them also, before quitting.
proc finish_test {} {return}
proc finish_test {} {
finish_test_precleanup
return
}
foreach extra $argv {
puts "Running \"$extra\""
db_delete_and_reopen
@@ -1219,9 +1234,6 @@ proc finish_test {} {
}
}
catch {db close}
catch {db1 close}
catch {db2 close}
catch {db3 close}
if {0==[info exists ::SLAVE]} { finalize_testing }
}
proc finalize_testing {} {