flush-cache: run it as a separate program, not using 'source'
That way it doesn't clutter up 'redo -x' as much.
This commit is contained in:
parent
43b74f3220
commit
8dad223225
8 changed files with 15 additions and 13 deletions
|
|
@ -2,15 +2,15 @@ rm -f chdir1
|
|||
redo chdir2
|
||||
redo chdir3
|
||||
|
||||
. ./flush-cache.sh
|
||||
./flush-cache.sh
|
||||
redo-ifchange chdir3
|
||||
|
||||
rm -f chdir1
|
||||
. ./flush-cache.sh
|
||||
./flush-cache.sh
|
||||
redo-ifchange chdir3
|
||||
[ -e chdir1 ] || exit 77
|
||||
|
||||
rm -f chdir1
|
||||
. ./flush-cache.sh
|
||||
./flush-cache.sh
|
||||
redo-ifchange chdir3
|
||||
[ -e chdir1 ] || exit 78
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
rm -f *.out *.log
|
||||
|
||||
. ../../flush-cache.sh
|
||||
../../flush-cache.sh
|
||||
redo-ifchange 1.out 2.out
|
||||
[ "$(cat 1.log | wc -l)" = 1 ] || exit 55
|
||||
[ "$(cat 2.log | wc -l)" = 1 ] || exit 56
|
||||
. ../../flush-cache.sh
|
||||
../../flush-cache.sh
|
||||
touch 1.in
|
||||
redo-ifchange 1.out 2.out
|
||||
[ "$(cat 1.log | wc -l)" = 2 ] || exit 57
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
rm -f log dir1/log dir1/stinky
|
||||
touch t1.do
|
||||
. ../../flush-cache.sh
|
||||
../../flush-cache.sh
|
||||
redo t1
|
||||
touch t1.do
|
||||
. ../../flush-cache.sh
|
||||
../../flush-cache.sh
|
||||
redo t1
|
||||
. ../../flush-cache.sh
|
||||
../../flush-cache.sh
|
||||
redo-ifchange t1
|
||||
C1="$(wc -l <dir1/log)"
|
||||
C2="$(wc -l <log)"
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ rm -f static.log
|
|||
redo static1 static2
|
||||
|
||||
touch static.in
|
||||
. ../flush-cache.sh
|
||||
../flush-cache.sh
|
||||
redo-ifchange static1 static2
|
||||
|
||||
COUNT=$(wc -l <static.log)
|
||||
|
|
|
|||
|
|
@ -1,19 +1,19 @@
|
|||
rm -f genfile2 genfile2.do genfile.log
|
||||
|
||||
echo echo hello >genfile2.do
|
||||
. ../flush-cache.sh
|
||||
../flush-cache.sh
|
||||
redo genfile1
|
||||
|
||||
# this will cause a rebuild:
|
||||
# genfile1 depends on genfile2 depends on genfile2.do
|
||||
rm -f genfile2.do
|
||||
. ../flush-cache.sh
|
||||
../flush-cache.sh
|
||||
redo-ifchange genfile1
|
||||
|
||||
# but genfile2.do was gone last time, so genfile2 no longer depends on it.
|
||||
# thus, it can be considered up-to-date. Prior versions of redo had a bug
|
||||
# where the dependency on genfile2.do was never dropped.
|
||||
. ../flush-cache.sh
|
||||
../flush-cache.sh
|
||||
redo-ifchange genfile1
|
||||
|
||||
COUNT=$(wc -l <genfile.log)
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@ if [ -e t1a ]; then
|
|||
else
|
||||
BEFORE=
|
||||
fi
|
||||
../flush-cache.sh
|
||||
redo-ifchange t1a # it definitely had to rebuild because t1dep changed
|
||||
AFTER="$(cat t1a)"
|
||||
if [ "$BEFORE" = "$AFTER" ]; then
|
||||
|
|
|
|||
1
t/flush-cache.sh
Normal file → Executable file
1
t/flush-cache.sh
Normal file → Executable file
|
|
@ -1,3 +1,4 @@
|
|||
#!/bin/sh
|
||||
#echo "Flushing redo cache..." >&2
|
||||
find "$REDO_BASE/.redo" -name 'built^*' -o -name 'mark^*' |
|
||||
xargs rm -f >&2
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
rm -f makedir.log
|
||||
redo makedir
|
||||
touch makedir/outfile
|
||||
. ./flush-cache.sh
|
||||
./flush-cache.sh
|
||||
redo-ifchange makedir
|
||||
COUNT=$(wc -l <makedir.log)
|
||||
[ "$COUNT" = 1 ] || exit 99
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue