Fix tests on MacOS.

This comes down to the lack of a 'seq' command (what?!) and the fact that
BSD "wc -l" returns extra whitespace, while the GNU version doesn't.  We
should be using numeric comparisons instead of string comparisons, and then
it's ok.
This commit is contained in:
Avery Pennarun 2010-12-12 05:38:30 -08:00
commit 8f9453a55d
12 changed files with 23 additions and 17 deletions

View file

@ -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

View file

@ -10,7 +10,7 @@ redo-ifchange t1
C1="$(wc -l <dir1/log)"
C2="$(wc -l <log)"
. ../../skip-if-minimal-do.sh
if [ "$C1" != 1 -o "$C2" != 2 ]; then
if [ "$C1" -ne 1 -o "$C2" -ne 2 ]; then
echo "failed: t1>t1, c1=$C1, c2=$C2" >&2
exit 55
fi

View file

@ -8,4 +8,4 @@ redo-ifchange static1 static2
COUNT=$(wc -l <static.log)
. ../skip-if-minimal-do.sh
[ "$COUNT" = 4 ] || exit 55
[ "$COUNT" -eq 4 ] || exit 55

View file

@ -18,4 +18,4 @@ redo-ifchange genfile1
COUNT=$(wc -l <genfile.log)
. ../skip-if-minimal-do.sh
[ "$COUNT" = 2 ] || exit 77
[ "$COUNT" -eq 2 ] || exit 77

View file

@ -3,7 +3,7 @@ redo t2
redo t2
OUT=$(cat t2.count | wc -l)
. ../skip-if-minimal-do.sh
if [ "$OUT" != 2 ]; then
if [ "$OUT" -ne 2 ]; then
echo "t2: expected 2"
exit 43
fi