Have testrunner.tcl return a non-zero exit status if one or more tests have failed.

FossilOrigin-Name: 50ddc36d32540b6d98990b5c9a465beb5b68cc31ae3f0ed162f6fe07e7c74e2d

diff --git a/manifest b/manifest
index 445e8014d5bcad2e3462cd52eb2a6d2be335b49b..ee79d07a54139ef321f51c816caead6dd42098be 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C New\sCLI\sprompt\sescape\ssequences:\s\s/r,\s/A,\s/v,\s/V,\sand\s/D../D.
-D 2026-04-23T15:05:46.973
+C Have\stestrunner.tcl\sreturn\sa\snon-zero\sexit\sstatus\sif\sone\sor\smore\stests\shave\sfailed.
+D 2026-04-23T15:54:00.129
 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@ -1720,7 +1720,7 @@ F test/temptrigfault.tes fc5918e64f3867156fefe7cfca9d8e1f495134a5229b2b511b0dc11
 F test/temptrigger.test a00f258ed8d21a0e8fd4f322f15e8cfb5cef2e43655670e07a753e3fb4769d61
 F test/tester.tcl 2d943f60200e0a36bcd3f1f0baf181a751cd3604ef6b6bd4c8dc39b4e8a53116
 F test/testloadext.c 862b848783eaed9985fbce46c65cd214664376b549fae252b364d5d1ef350a27
-F test/testrunner.tcl 1ad787b744277532521a2a9898ac66ee6a8363fbcc1211027db0dadad4ee3214 x
+F test/testrunner.tcl 6d13732185c13aef87540ebf9daafb8d9657e66f0ac00eb082d93f4749311d4e x
 F test/testrunner_data.tcl dfcf192d274e965845189cc014ac89fff91dde92b6e2ac9e1262897fc21ee2e0
 F test/testrunner_estwork.tcl 81e2ae10238f50540f42fbf2d94913052a99bfb494b69e546506323f195dcff9
 F test/thread001.test a0985c117eab62c0c65526e9fa5d1360dd1cac5b03bde223902763274ce21899
@@ -2203,8 +2203,8 @@ F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee
 F tool/warnings.sh a554d13f6e5cf3760f041b87939e3d616ec6961859c3245e8ef701d1eafc2ca2
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
 F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c
-P 706373dcbe43752cf21604f278f96fb3015a36089ad64f069bb3a64bc526d137
-R d97f1546f6e3e8815d53cf5cfb6143b0
-U drh
-Z b0844759ca50f5075fba7f38fd3b6ac9
+P e7c7acd1a4e5cb0f8e68f119352480c1aa9dd3c2b289c92f88e9e697a2e440e0
+R ce5ff5cb6237d0749d0d59bd9ff7f7b8
+U dan
+Z 0037f23c5e61abb774fba5ce36636000
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 3d05c96a113fd4518f6e7d40530535d26be22ec4..2f9f4942169a62573fc1600f7e2f1914503752aa 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e7c7acd1a4e5cb0f8e68f119352480c1aa9dd3c2b289c92f88e9e697a2e440e0
+50ddc36d32540b6d98990b5c9a465beb5b68cc31ae3f0ed162f6fe07e7c74e2d

diff --git a/test/testrunner.tcl b/test/testrunner.tcl
index d419c50421c7ff628d20322337ebe3bec3104d03..e08bca4577c57c8d879bc582fadfcf9e2ccd4dc8 100755 (executable)
--- a/test/testrunner.tcl
+++ b/test/testrunner.tcl
@@ -1969,6 +1969,7 @@ proc run_testset {} {
      SELECT DISTINCT substr(svers,1,79) as v1 FROM jobs WHERE svers IS NOT NULL
   } {puts $v1}
 
+  return [expr {$nErr>0}]
 }
 
 # If the argument is "retest", simply rerun all tests from the previous
@@ -2028,6 +2029,7 @@ proc explain_tests {} {
   explain_layer "" ""
 }
 
+set exit_status 0
 sqlite3 trdb $TRG(dbname)
 trdb timeout $TRG(timeout)
 if {[llength $TRG(patternlist)]==1 && $TRG(patternlist) eq "retest"} {
@@ -2046,6 +2048,10 @@ if {$TRG(explain)} {
     puts "built testset in [expr $tm/1000]ms.."
   }
   handle_buildonly
-  run_testset
+  set exit_status [run_testset]
 }
 trdb close
+exit $exit_status
+
+
+