forks/apenwarr-redo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't set_checked() on is_override files.

Browse source 
If a file is overridden and then overridden again, this caused us to
rebuild only the first thing that depends on it, but not any subsequent
things, which is a pretty serious bug.

It turned out that t/350-deps-forget is already supposed to test this,
but I had cleverly encoded the wrong behaviour into the expected
results in the table-driven test.  I blame lack of sleep.  Anyway, I
fixed the test, which made it fail, and then fixed the code, which made
it pass.
This commit is contained in:
Avery Pennarun 2018-12-18 12:59:51 +00:00
commit 174a093dc5
2 changed files with 12 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

5
redo/builder.py
View file

@ -165,11 +165,10 @@ class _BuildJob(object):
warn('%s - old: %r\n' % (_nice(t), sf.stamp)) warn('%s - old: %r\n' % (_nice(t), sf.stamp))
warn('%s - new: %r\n' % (_nice(t), newstamp)) warn('%s - new: %r\n' % (_nice(t), newstamp))
sf.set_override() sf.set_override()
sf.set_checked()
sf.save() sf.save()
return self._finalize(0) # fall through and treat it the same as a static file
if (os.path.exists(t) and not os.path.isdir(t + '/.') if (os.path.exists(t) and not os.path.isdir(t + '/.')
and not sf.is_generated): and (sf.is_override or not sf.is_generated)):
# an existing source file that was not generated by us. # an existing source file that was not generated by us.
# This step is mentioned by djb in his notes. # This step is mentioned by djb in his notes.
# For example, a rule called default.c.do could be used to try # For example, a rule called default.c.do could be used to try

20
t/351-deps-forget/all.do
View file

@ -61,9 +61,9 @@ truth="
src del nil ran ran no 0 1 0 src del nil ran ran no 0 1 0
src del add ran ran no 0 1 0 src del add ran ran no 0 1 0
src add err skip skip no 1 0 0 # source updated src add err ran skip no 1 0 0 # source updated
src add nil skip skip no 1 0 0 src add nil ran skip no 1 0 0
src add add skip skip no 1 0 0 src add add ran skip no 1 0 0
# File was initially a target that produced nil # File was initially a target that produced nil
nil nop err skip ran no 0 0 0 # content forgotten nil nop err skip ran no 0 0 0 # content forgotten
@ -74,9 +74,9 @@ truth="
nil del nil ran ran no 0 1 0 nil del nil ran ran no 0 1 0
nil del add ran ran no 0 1 0 nil del add ran ran no 0 1 0
nil add err skip skip warn 1 0 0 # content overridden nil add err ran skip warn 1 0 0 # content overridden
nil add nil skip skip warn 1 0 0 nil add nil ran skip warn 1 0 0
nil add add skip skip warn 1 0 0 nil add add ran skip warn 1 0 0
# File was initially a target that produced output # File was initially a target that produced output
add nop err skip ran no 0 1 1 # update failed add nop err skip ran no 0 1 1 # update failed
@ -87,9 +87,9 @@ truth="
add del nil ran ran no 0 1 0 add del nil ran ran no 0 1 0
add del add ran ran no 0 1 0 add del add ran ran no 0 1 0
add add err skip skip warn 1 0 0 # content overridden add add err ran skip warn 1 0 0 # content overridden
add add nil skip skip warn 1 0 0 add add nil ran skip warn 1 0 0
add add add skip skip warn 1 0 0 add add add ran skip warn 1 0 0
" "
echo "$truth" | echo "$truth" |
@ -150,7 +150,7 @@ while read pre update post subran ran warn src targ ood XX; do
case $update in case $update in
nop) ;; nop) ;;
del) rm -f bork; skip=1 ;; del) rm -f bork; skip=1 ;;
add) echo override >>bork ;; add) echo override >>bork; skip=1 ;;
*) exit 91 ;; *) exit 91 ;;
esac esac