diff --git a/t/alwaystest.do b/t/alwaystest.do index 37bf270..17c01cb 100644 --- a/t/alwaystest.do +++ b/t/alwaystest.do @@ -5,21 +5,21 @@ redo t/always1 cd t [ "$(wc -l genfile2.do -../flush-cache.sh +../flush-cache.py redo genfile1 # this will cause a rebuild: # genfile1 depends on genfile2 depends on genfile2.do rm -f genfile2.do -../flush-cache.sh +../flush-cache.py 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.py redo-ifchange genfile1 COUNT=$(wc -l >sys.stderr, "Flushing redo cache..." + +db_file = os.path.join(os.environ["REDO_BASE"], ".redo", "db.sqlite3") +db_con = sqlite3.connect(db_file, timeout=5000) + +db_con.executescript("pragma synchronous = off;" + "update Files set checked_runid=checked_runid-1, " + " changed_runid=changed_runid-1, " + " failed_runid=failed_runid-1;") + +db_con.commit() + +db_con.close() + diff --git a/t/flush-cache.sh b/t/flush-cache.sh deleted file mode 100755 index 7bd22fa..0000000 --- a/t/flush-cache.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -#echo "Flushing redo cache..." >&2 -if [ -z "$DO_BUILT" ]; then - ( - echo ".timeout 5000" - echo "pragma synchronous = off;" - echo "update Files set checked_runid=checked_runid-1, " \ - " changed_runid=changed_runid-1, " \ - " failed_runid=failed_runid-1;" - ) | sqlite3 "$REDO_BASE/.redo/db.sqlite3" -fi - diff --git a/t/ifcreate-test.do b/t/ifcreate-test.do index 73586f1..42a9018 100644 --- a/t/ifcreate-test.do +++ b/t/ifcreate-test.do @@ -10,11 +10,11 @@ for d in 1 2; do [ "$(wc -l inp -../flush-cache.sh +../flush-cache.py redo stampy [ "$(wc -l inp redo stampy [ "$(wc -l