mirror of
https://github.com/sqlite/sqlite.git
synced 2025-07-29 08:01:23 +03:00
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
This commit is contained in:
@ -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)"
|
||||
|
Reference in New Issue
Block a user