t-expect-fail () {
local mpat="$1"; shift
+
+ local grepper=fgrep
+ case "$mpat" in
+ [A-Z]:*)
+ case "$mpat" in
+ E:*) grepper=egrep ;;
+ F:*) grepper=fgrep ;;
+ *) fail "bad mpat prefix in $mpat";;
+ esac
+ mpat=${mpat#[A-Z]:}
+ ;;
+ esac
+
set +o pipefail
LC_MESSAGES=C "$@" 2>&1 | tee $tmp/t.output
local gotstatus=${PIPESTATUS[0]}
set -o pipefail
test $gotstatus != 0
- egrep "$mpat" $tmp/t.output ||false
+ $grepper -e "$mpat" $tmp/t.output ||false
}
t-reporefs () {
+ local whichoutput=$1; shift
+ local outputfile="$tmp/show-refs.$whichoutput"
(set -e
- if test -d $tmp/git/$p.git; then
+ exec >"$outputfile"
+ if test -d $tmp/git/$p.git; then
cd $tmp/git/$p.git
git show-ref |sort
fi)