If a build fails in testrunner.tcl, do not attempt to run the jobs that

depend on that build.  Instead, report those jobs as having been skipped.

FossilOrigin-Name: b40580be719a129ecd1aa3c69d1086c967d063920fdd48617c864e73c059abc1

diff --git a/manifest b/manifest
index ceff35c009c9cd7bbb30c901e0eac9b3722374da..c7c6ea43aff63ce44bad6471804a9315f6017a77 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fixes\sand\snew\stests\slogic\sto\sensure\sthat\sthe\sbtree\soverflow\spage\scache\sis\nonly\sused\swhen\sit\sis\sconsistent.\s\sThis\sresolves\sthe\smalfunction\sobserved\nin\s[forum:/forumpost/284955a3cd454a15|forum\spost\s284955a3cd454a15].
-D 2024-04-12T15:02:16.718
+C If\sa\sbuild\sfails\sin\stestrunner.tcl,\sdo\snot\sattempt\sto\srun\sthe\sjobs\sthat\ndepend\son\sthat\sbuild.\s\sInstead,\sreport\sthose\sjobs\sas\shaving\sbeen\sskipped.
+D 2024-04-12T18:46:34.309
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -1690,7 +1690,7 @@ F test/temptable2.test 76821347810ecc88203e6ef0dd6897b6036ac788e9dd3e6b04fd4d163
 F test/temptable3.test d11a0974e52b347e45ee54ef1923c91ed91e4637
 F test/temptrigger.test 38f0ca479b1822d3117069e014daabcaacefffcc
 F test/tester.tcl fe617b88c7eb08bdf983d2aaa31c20fbf439eee7b8e0d61ca636fcd0c305bbbf
-F test/testrunner.tcl b48a8fc17e3b200244f53d60348afa7fe9482400d164e95709890743af9536d0
+F test/testrunner.tcl 1386667c04207d0a540ce1a9bc5ee0b734f7a3ba856c14a03943fb4f32de55bb
 F test/testrunner_data.tcl 3d36660cfd55ea5e20e661e8f94c0520feebcb437848f9b98b33c483cc479c0c
 F test/thread001.test a0985c117eab62c0c65526e9fa5d1360dd1cac5b03bde223902763274ce21899
 F test/thread002.test c24c83408e35ba5a952a3638b7ac03ccdf1ce4409289c54a050ac4c5f1de7502
@@ -2184,9 +2184,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 5dae6e6df4921f42e45c6c8de40853ab63f53a4bd1d9088a8cdac957ce62f196 0ebc65481f4a3e7974558adea51c620a025bc0e76c0a139e549b56c5abe0cabb
-R 733b2640d8dc44517728193a890baeff
-T +closed 0ebc65481f4a3e7974558adea51c620a025bc0e76c0a139e549b56c5abe0cabb
+P 5dede50d9e7b6942df9f7b00fbfeaa2103c36c5da01d63d88136fb0ef4b7d26d
+R 4f3eb54a5cce9aa23292ec96983abdb3
 U drh
-Z 49129cd4194bac4dbb6265651119b7c1
+Z 1648e8675f24aa01764212367c0fba7b
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 8b1f8f1238f6c8e569b77bbbfcb21364a4f02133..b40ee8722e6f325941a42bbc49139ae113bca053 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5dede50d9e7b6942df9f7b00fbfeaa2103c36c5da01d63d88136fb0ef4b7d26d
\ No newline at end of file
+b40580be719a129ecd1aa3c69d1086c967d063920fdd48617c864e73c059abc1
\ No newline at end of file

diff --git a/test/testrunner.tcl b/test/testrunner.tcl
index 05f7d4cc98dfdad4ba2558e4ffd57147534a3898..fd82716769089c722e1b4a3f510513f0a7210c38 100644 (file)
--- a/test/testrunner.tcl
+++ b/test/testrunner.tcl
@@ -270,7 +270,7 @@ set TRG(schema) {
     /* Fields updated as jobs run */
     starttime INTEGER, 
     endtime INTEGER,
-    state TEXT CHECK( state IN ('', 'ready', 'running', 'done', 'failed') ),
+    state TEXT CHECK( state IN ('','ready','running','done','failed','omit') ),
     output TEXT
   );
 
@@ -447,6 +447,10 @@ if {[llength $argv]==1
     } job {
       display_job [array get job]
     }
+    set nOmit [db one {SELECT count(*) FROM jobs WHERE state='omit'}]
+    if {$nOmit} {
+      puts "$nOmit jobs omitted due to failures"
+    }
   }
  
   mydb close
@@ -975,11 +979,16 @@ proc make_new_testset {} {
 
 proc mark_job_as_finished {jobid output state endtm} {
   r_write_db {
+    if {$state=="failed"} {
+      set childstate omit
+    } else {
+      set childstate ready
+    }
     trdb eval {
       UPDATE jobs 
         SET output=$output, state=$state, endtime=$endtm
         WHERE jobid=$jobid;
-      UPDATE jobs SET state='ready' WHERE depid=$jobid;
+      UPDATE jobs SET state=$childstate WHERE depid=$jobid;
     }
   }
 }
@@ -1202,6 +1211,10 @@ proc run_testset {} {
         puts "FAILED: $displayname"
       }
     }
+    set nOmit [trdb one {SELECT count(*) FROM jobs WHERE state='omit'}]
+    if {$nOmit>0} {
+      puts "$nOmit jobs skipped due to prior failures"
+    }
   }
 
   puts "\nTest database is $TRG(dbname)"