git.shiar.nl
/
barcat.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
t: report missing output as TODO
[barcat.git]
/
t
/
regress.t
diff --git
a/t/regress.t
b/t/regress.t
index f81cfd7aab1ace5f30f91baa8f09e77f23bdaa82..eedefbbb1a7f303d77e56ee306c508700d34ab38 100755
(executable)
--- a/
t/regress.t
+++ b/
t/regress.t
@@
-3,10
+3,20
@@
cd "${0%/*}" || exit 1
test_count=0
cd "${0%/*}" || exit 1
test_count=0
+fail_count=0
COLUMNS=40
COLUMNS=40
-diffcmd='diff --unchanged-line-format= --old-line-format=<%L --new-line-format=>%L'
+colorize=
+test -t 1 && colorize=1
+color () {
+ test -n "$colorize" &&
+ printf '\e[%sm' $@
+}
regenerate=
regenerate=
+diffcmd () {
+ comm --nocheck-order --output-delimiter=::: -3 $@ |
+ perl -pe"END{exit !!\$.} s/^:::/$(color 31)>/ || s/^/$(color 32)</"
+}
for option in "$@"
do
for option in "$@"
do
@@
-23,8
+33,9
@@
do
test -r "$file.in" || continue
name="$(echo ${file#*-} | tr _ \ )"
test -r "$file.in" || continue
name="$(echo ${file#*-} | tr _ \ )"
- cmd="barcat $file.in"
- case "$name" in *\ -*) cmd="$cmd -${name#* -}";; esac
+ set -- barcat "$file.in"
+ case "$name" in *\ -*) set -- "$@" "-${name#* -}";; esac
+ case "$name" in *' |'*) set -- sh -c "\$0 \$1 $3" "$@";; esac
if test -n "$regenerate"
then
if test -n "$regenerate"
then
@@
-33,14
+44,38
@@
do
echo "ok $test_count # skip $file.out"
continue
fi
echo "ok $test_count # skip $file.out"
continue
fi
- $cmd >$file.out 2>&1
+ "$@" >$file.out 2>&1
+ elif test -e "$file.out"
+ then
+ "$@" 2>&1 | diffcmd "$file.out" -
else
else
- if test -e $file.sh; then $cmd 2>&1 | ./$file.sh; fi &&
- if test -e $file.out; then $cmd 2>&1 | $diffcmd "$file.out" -; fi
+ color 33
+ echo "not ok $test_count - $name # TODO"
+ color 0
+ continue
fi
fi
- test 0 = $? || printf 'not '
+ if test 0 != $?
+ then
+ fail_count=$((fail_count+1))
+ color 1\;31
+ printf 'not '
+ fi
echo "ok $test_count - $name"
echo "ok $test_count - $name"
+ color 0
done
done
+if test $fail_count = 0
+then
+ color 32
+ echo "# passed all $test_count test(s)"
+else
+ color 31
+ echo "# failed $fail_count among $test_count test(s)"
+ fail_count=1 # exit code
+fi
+
+color 0\;36
echo "1..$test_count"
echo "1..$test_count"
+color 0
+exit $fail_count