kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Revert "tests: when run in Bash, annotate test failures with file name/line number" 

This reverts commit 662f9cf154,
to fix the TAP output broken for bash.
maint
Junio C Hamano 2020-05-15 09:47:51 -07:00
parent 4024295568
commit e31600b03f
1 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
t/test-lib.sh
View File

@ -675,18 +675,6 @@ die () {
fi fi
} }


file_lineno () {
test -z "$GIT_TEST_FRAMEWORK_SELFTEST" && test -n "$BASH" || return 0
local i
for i in ${!BASH_SOURCE[*]}
do
case $i,"${BASH_SOURCE[$i]##*/}" in
0,t[0-9]*.sh) echo "t/${BASH_SOURCE[$i]}:$LINENO: ${1+$1: }"; return;;
*,t[0-9]*.sh) echo "t/${BASH_SOURCE[$i]}:${BASH_LINENO[$(($i-1))]}: ${1+$1: }"; return;;
esac
done
}

GIT_EXIT_OK= GIT_EXIT_OK=
trap 'die' EXIT trap 'die' EXIT
# Disable '-x' tracing, because with some shells, notably dash, it # Disable '-x' tracing, because with some shells, notably dash, it
@ -732,7 +720,7 @@ test_failure_ () {
write_junit_xml_testcase "$1" " $junit_insert" write_junit_xml_testcase "$1" " $junit_insert"
fi fi
test_failure=$(($test_failure + 1)) test_failure=$(($test_failure + 1))
say_color error "$(file_lineno error)not ok $test_count - $1" say_color error "not ok $test_count - $1"
shift shift
printf '%s\n' "$*" | sed -e 's/^/# /' printf '%s\n' "$*" | sed -e 's/^/# /'
test "$immediate" = "" || { finalize_junit_xml; GIT_EXIT_OK=t; exit 1; } test "$immediate" = "" || { finalize_junit_xml; GIT_EXIT_OK=t; exit 1; }