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: multiple command arguments
[barcat.git]
/
t
/
regress.t
diff --git
a/t/regress.t
b/t/regress.t
index 45ee5ba2b64d56682f78719e1520bfbe7943da50..8f92ee7958524d98054349813aaad47c0791cd2a 100755
(executable)
--- a/
t/regress.t
+++ b/
t/regress.t
@@
-3,12
+3,19
@@
cd "${0%/*}" || exit 1
test_count=0
cd "${0%/*}" || exit 1
test_count=0
+fail_count=0
COLUMNS=40
COLUMNS=40
+colorize=
+test -t 1 && colorize=1
+color () {
+ test -n "$colorize" &&
+ printf '\e[%sm' $@
+}
regenerate=
diffcmd () {
comm --nocheck-order --output-delimiter=::: -3 $@ |
regenerate=
diffcmd () {
comm --nocheck-order --output-delimiter=::: -3 $@ |
- perl -pe
'END{exit !!$.} s/^:::/>/ || s/^/</'
+ perl -pe
"END{exit !!\$.} s/^:::/$(color 31)>/ || s/^/$(color 32)</"
}
for option in "$@"
}
for option in "$@"
@@
-26,8
+33,12
@@
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" "$@";;
+ *) set -- "$1" "$2" $3
+ esac
if test -n "$regenerate"
then
if test -n "$regenerate"
then
@@
-36,14
+47,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