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: rename output files without command parameters
[barcat.git]
/
t
/
regress.t
diff --git
a/t/regress.t
b/t/regress.t
index eedefbbb1a7f303d77e56ee306c508700d34ab38..177cc8dfa1f22c0f99208e60d7fa104bcfcabdd9 100755
(executable)
--- a/
t/regress.t
+++ b/
t/regress.t
@@
-5,49
+5,34
@@
cd "${0%/*}" || exit 1
test_count=0
fail_count=0
test_count=0
fail_count=0
-COLUMNS=40
colorize=
test -t 1 && colorize=1
color () {
test -n "$colorize" &&
colorize=
test -t 1 && colorize=1
color () {
test -n "$colorize" &&
- printf '\e[%sm' $@
-}
-regenerate=
-diffcmd () {
- comm --nocheck-order --output-delimiter=::: -3 $@ |
- perl -pe"END{exit !!\$.} s/^:::/$(color 31)>/ || s/^/$(color 32)</"
+ printf '\33[%sm' $@
}
for option in "$@"
do
case "$option" in
}
for option in "$@"
do
case "$option" in
- -G) regenerate=1 && shift;;
- -*) echo "Usage: $0 [-G] [<files>...]"; exit 64;;
+ -*) echo "Usage: $0 [<files>...]"; exit 64;;
esac
done
esac
done
-for candidate in ${@:-t*.in}
+params="${@:-t*.out}"
+color 0\;36
+echo "1..$(echo $params | wc -w)"
+color 0
+
+for candidate in $params
do
test_count=$((test_count+1))
do
test_count=$((test_count+1))
- file="${candidate%.in}"
- test -r "$file.in" || continue
-
+ file="${candidate%.out}"
name="$(echo ${file#*-} | tr _ \ )"
name="$(echo ${file#*-} | tr _ \ )"
- set -- barcat "$file.in"
- case "$name" in *\ -*) set -- "$@" "-${name#* -}";; esac
- case "$name" in *' |'*) set -- sh -c "\$0 \$1 $3" "$@";; esac
- if test -
n "$regenerate
"
+ if test -
e "$file.out
"
then
then
- if test -e $file.sh
- then
- echo "ok $test_count # skip $file.out"
- continue
- fi
- "$@" >$file.out 2>&1
- elif test -e "$file.out"
- then
- "$@" 2>&1 | diffcmd "$file.out" -
+ ./cmddiff "$file.out"
else
color 33
echo "not ok $test_count - $name # TODO"
else
color 33
echo "not ok $test_count - $name # TODO"
@@
-57,8
+42,15
@@
do
if test 0 != $?
then
if test 0 != $?
then
- fail_count=$((fail_count+1))
- color 1\;31
+ case "$name" in
+ *' #TODO')
+ color 33
+ ;;
+ *)
+ fail_count=$((fail_count+1))
+ color 1\;31
+ esac
+
printf 'not '
fi
echo "ok $test_count - $name"
printf 'not '
fi
echo "ok $test_count - $name"
@@
-74,8
+66,6
@@
else
echo "# failed $fail_count among $test_count test(s)"
fail_count=1 # exit code
fi
echo "# failed $fail_count among $test_count test(s)"
fail_count=1 # exit code
fi
-
-color 0\;36
-echo "1..$test_count"
color 0
color 0
+
exit $fail_count
exit $fail_count