From 8dad22322588a9620c934edb9ae8d332e16f5a28 Mon Sep 17 00:00:00 2001
From: Avery Pennarun <apenwarr@gmail.com>
Date: Wed, 8 Dec 2010 20:16:26 -0800
Subject: [PATCH] flush-cache: run it as a separate program, not using 'source'

That way it doesn't clutter up 'redo -x' as much.
---
 t/chdirtest.do         | 6 +++---
 t/deps/basic/test.do   | 4 ++--
 t/deps/dirtest/test.do | 6 +++---
 t/deps/doublestatic.do | 2 +-
 t/deps/gentest.do      | 6 +++---
 t/deps/test1.do        | 1 +
 t/flush-cache.sh       | 1 +
 t/makedir2.do          | 2 +-
 8 files changed, 15 insertions(+), 13 deletions(-)
 mode change 100644 => 100755 t/flush-cache.sh

diff --git a/t/chdirtest.do b/t/chdirtest.do
index 302305c..ac0fe17 100644
--- a/t/chdirtest.do
+++ b/t/chdirtest.do
@@ -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
diff --git a/t/deps/basic/test.do b/t/deps/basic/test.do
index 90b9126..5bc14c3 100644
--- a/t/deps/basic/test.do
+++ b/t/deps/basic/test.do
@@ -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
diff --git a/t/deps/dirtest/test.do b/t/deps/dirtest/test.do
index 2c5f8ee..c2fd244 100644
--- a/t/deps/dirtest/test.do
+++ b/t/deps/dirtest/test.do
@@ -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)"
diff --git a/t/deps/doublestatic.do b/t/deps/doublestatic.do
index 39493c8..a1c4f0f 100644
--- a/t/deps/doublestatic.do
+++ b/t/deps/doublestatic.do
@@ -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)
diff --git a/t/deps/gentest.do b/t/deps/gentest.do
index 5b6772e..6b5b52e 100644
--- a/t/deps/gentest.do
+++ b/t/deps/gentest.do
@@ -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)
diff --git a/t/deps/test1.do b/t/deps/test1.do
index c695755..6cfc2bb 100644
--- a/t/deps/test1.do
+++ b/t/deps/test1.do
@@ -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
diff --git a/t/flush-cache.sh b/t/flush-cache.sh
old mode 100644
new mode 100755
index eabf3a1..4f8f8f9
--- a/t/flush-cache.sh
+++ b/t/flush-cache.sh
@@ -1,3 +1,4 @@
+#!/bin/sh
 #echo "Flushing redo cache..." >&2
 find "$REDO_BASE/.redo" -name 'built^*' -o -name 'mark^*' |
 	xargs rm -f >&2
diff --git a/t/makedir2.do b/t/makedir2.do
index 9918b69..e4673b3 100644
--- a/t/makedir2.do
+++ b/t/makedir2.do
@@ -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