Index: Tests/common.eagle ================================================================== --- Tests/common.eagle +++ Tests/common.eagle @@ -1366,11 +1366,11 @@ return [regsub -all -- {\s+} [string trim $sql] " "] } proc executeSql { sql {execute none} {format none} {fileName ""} } { if {[string length $fileName] == 0} then {set fileName :memory:} - setupDb $fileName "" "" "" "" "" false false false false + setupDb $fileName "" "" "" "" "" false false false false db true try { return [uplevel 1 [list \ sql execute -execute $execute -format $format $db $sql]] } finally { @@ -1379,11 +1379,11 @@ } proc setupDb { fileName {mode ""} {dateTimeFormat ""} {dateTimeKind ""} {flags ""} {extra ""} {qualify true} {delete true} {uri false} - {temporary true} {varName db} } { + {temporary true} {varName db} {quiet false} } { # # NOTE: First, see if our caller has requested an in-memory database. # set isMemory [isMemoryDb $fileName] @@ -1408,13 +1408,15 @@ # if {[catch {file delete $fileName} error]} then { # # NOTE: We somehow failed to delete the file, report why. # - tputs $::test_channel [appendArgs \ - "==== WARNING: failed to delete database file \"" $fileName \ - "\" during setup, error: " \n\t $error \n] + if {!$quiet} then { + tputs $::test_channel [appendArgs \ + "==== WARNING: failed to delete database file \"" $fileName \ + "\" during setup, error: " \n\t $error \n] + } } } # # NOTE: Refer to the specified variable (e.g. "db") in the context of our @@ -1472,23 +1474,33 @@ # connection). # if {[info exists ::connection_flags] && \ [string length $::connection_flags] > 0} then { # - # NOTE: Show (and log) that we detected some global connection flags. + # NOTE: Show (and log) that the local and global connection flags. # - tputs $::test_channel [appendArgs \ - "---- global connection flags detected: " $::connection_flags \n] + if {!$quiet} then { + tputs $::test_channel [appendArgs \ + "---- local connection flags are: " $flags \n] + + tputs $::test_channel [appendArgs \ + "---- global connection flags detected: " $::connection_flags \n] + } # # NOTE: Combine and/or replace the connection flags and then show the # new value. # set flags [combineFlags $flags $::connection_flags] - tputs $::test_channel [appendArgs \ - "---- combined connection flags are: " $flags \n] + # + # NOTE: Show (and log) the new effective connection flags. + # + if {!$quiet} then { + tputs $::test_channel [appendArgs \ + "---- combined connection flags are: " $flags \n] + } } # # NOTE: If our caller specified some SQLiteConnectionFlags, add the # necessary portion of the connection string now. Index: Tests/stress.eagle ================================================================== --- Tests/stress.eagle +++ Tests/stress.eagle @@ -60,11 +60,11 @@ # to delete the underlying database file as that would not make any # sense. Also, disable use of "PRAGMA temp_store_directory" when # setting up the new connection because it is not thread-safe. # uplevel 1 [list setupDb $fileName "" "" "" "" "" false false true false \ - $varName] + $varName true] } ############################################################################# proc setupWorkloadFileDb { fileName {varName db} } { @@ -72,11 +72,11 @@ # NOTE: Skip attempting to delete the underlying database file. Also, # disable use of "PRAGMA temp_store_directory" when setting up # the new connection because it is not thread-safe. # uplevel 1 [list setupDb $fileName "" "" "" "" "" true false false false \ - $varName] + $varName true] } ############################################################################# proc formatWorkloadResult { index } {