Index: third_party/sqlite/src/test/thread_common.tcl |
diff --git a/third_party/sqlite/src/test/thread_common.tcl b/third_party/sqlite/src/test/thread_common.tcl |
index bbd9389ea03cd656c01cc34357ec801078c4bf3b..6b17082ad4508528d2fd2d6686996c682bf7e89a 100644 |
--- a/third_party/sqlite/src/test/thread_common.tcl |
+++ b/third_party/sqlite/src/test/thread_common.tcl |
@@ -80,7 +80,7 @@ set thread_procs { |
} |
proc thread_spawn {varname args} { |
- sqlthread spawn $varname [join $args ;] |
+ sqlthread spawn $varname [join $args {;}] |
} |
# Return true if this build can run the multi-threaded tests. |
@@ -89,6 +89,9 @@ proc run_thread_tests {{print_warning 0}} { |
ifcapable !mutex { |
set zProblem "SQLite build is not threadsafe" |
} |
+ ifcapable mutex_noop { |
+ set zProblem "SQLite build uses SQLITE_MUTEX_NOOP" |
+ } |
if {[info commands sqlthread] eq ""} { |
set zProblem "SQLite build is not threadsafe" |
} |
@@ -96,16 +99,10 @@ proc run_thread_tests {{print_warning 0}} { |
set zProblem "Linked against a non-threadsafe Tcl build" |
} |
if {[info exists zProblem]} { |
- if {$print_warning} { |
- if {[info exists ::run_thread_tests_failed]} { |
- puts "WARNING: Multi-threaded tests skipped: $zProblem" |
- } |
- } else { |
- puts "Skipping thread tests: $zProblem" |
- set ::run_thread_tests_failed 1 |
- } |
+ puts "WARNING: Multi-threaded tests skipped: $zProblem" |
return 0 |
} |
+ set ::run_thread_tests_called 1 |
return 1; |
} |