diff --git a/t/curse/Makefile b/t/curse/Makefile index a0b5862..d4872fa 100644 --- a/t/curse/Makefile +++ b/t/curse/Makefile @@ -1,13 +1,13 @@ all: . ./check-1.sh $(MAKE) 1.n0 2.n0 3.n0 - $(MAKE) $(shell seq 10 | sed 's/$$/.n1/') + $(MAKE) $(shell ./seq 10 | sed 's/$$/.n1/') . ./check-2.sh -%.n0: $(shell seq 10 | sed 's/$$/.n1/') +%.n0: $(shell ./seq 10 | sed 's/$$/.n1/') : >$@ -%.n1: $(shell seq 100 | sed 's/$$/.n2/') +%.n1: $(shell ./seq 100 | sed 's/$$/.n2/') echo n1-$* >$@ .PRECIOUS: %.n2 diff --git a/t/curse/check-2.sh b/t/curse/check-2.sh index 87061af..6dce157 100644 --- a/t/curse/check-2.sh +++ b/t/curse/check-2.sh @@ -1,12 +1,12 @@ COUNT_IN=$(ls *.count | wc -l) COUNT_OUT=$(cat *.count | wc -l) -if [ "$COUNT_IN" != "$COUNT_OUT" ]; then +if [ "$COUNT_IN" -ne "$COUNT_OUT" ]; then echo "expected $COUNT_IN individual writes, got $COUNT_OUT" >&2 exit 42 fi COUNTALL_IN=$(cat in.countall | wc -l) COUNTALL_OUT=$(cat out.countall | wc -l) -if [ "$COUNTALL_IN" != "$COUNTALL_OUT" ]; then +if [ "$COUNTALL_IN" -ne "$COUNTALL_OUT" ]; then echo "expected $COUNTALL_IN allwrites, got $COUNTALL_OUT" >&2 exit 43 fi diff --git a/t/curse/default.n0.do b/t/curse/default.n0.do index 056a36d..606c961 100644 --- a/t/curse/default.n0.do +++ b/t/curse/default.n0.do @@ -1,2 +1,2 @@ -DEPS=$(seq 10 | sed 's/$/.n1/') +DEPS=$(./seq 10 | sed 's/$/.n1/') redo-ifchange $DEPS diff --git a/t/curse/default.n1.do b/t/curse/default.n1.do index bb5b3d4..118f26c 100644 --- a/t/curse/default.n1.do +++ b/t/curse/default.n1.do @@ -1,3 +1,3 @@ -DEPS=$(seq 100 | sed 's/$/.n2/') +DEPS=$(./seq 100 | sed 's/$/.n2/') redo-ifchange $DEPS echo n1-$1 diff --git a/t/curse/seq b/t/curse/seq new file mode 100755 index 0000000..c6e264b --- /dev/null +++ b/t/curse/seq @@ -0,0 +1,6 @@ +#!/bin/sh +i=0 +while [ "$i" -lt "$1" ]; do + i=$(($i + 1)) + echo $i +done diff --git a/t/curse/test.do b/t/curse/test.do index ef06622..e8ac2e4 100644 --- a/t/curse/test.do +++ b/t/curse/test.do @@ -1,6 +1,6 @@ . ./check-1.sh redo-ifchange 1.n0 2.n0 3.n0 -DEPS=$(seq 10 | sed 's/$/.n1/') +DEPS=$(./seq 10 | sed 's/$/.n1/') redo-ifchange $DEPS . ../skip-if-minimal-do.sh . ./check-2.sh diff --git a/t/deps/basic/test.do b/t/deps/basic/test.do index c1b822f..b35e523 100644 --- a/t/deps/basic/test.do +++ b/t/deps/basic/test.do @@ -2,12 +2,12 @@ rm -f *.out *.log ../../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 +[ "$(cat 1.log | wc -l)" -eq 1 ] || exit 55 +[ "$(cat 2.log | wc -l)" -eq 1 ] || exit 56 ../../flush-cache.sh touch 1.in redo-ifchange 1.out 2.out -[ "$(cat 2.log | wc -l)" = 1 ] || exit 58 +[ "$(cat 2.log | wc -l)" -eq 1 ] || exit 58 . ../../skip-if-minimal-do.sh -[ "$(cat 1.log | wc -l)" = 2 ] || exit 57 +[ "$(cat 1.log | wc -l)" -eq 2 ] || exit 57 diff --git a/t/deps/dirtest/test.do b/t/deps/dirtest/test.do index b39be4d..08541ed 100644 --- a/t/deps/dirtest/test.do +++ b/t/deps/dirtest/test.do @@ -10,7 +10,7 @@ redo-ifchange t1 C1="$(wc -l t1, c1=$C1, c2=$C2" >&2 exit 55 fi diff --git a/t/deps/doublestatic.do b/t/deps/doublestatic.do index a385cc5..13cb2b6 100644 --- a/t/deps/doublestatic.do +++ b/t/deps/doublestatic.do @@ -8,4 +8,4 @@ redo-ifchange static1 static2 COUNT=$(wc -l