Revert "tests: when run in Bash, annotate test failures with file name/line number"
This reverts commit 662f9cf1548cf069cb819e9e95f224657015fcf9, to fix the TAP output broken for bash.
Junio C Hamano committed
May 15, 2020 at 09:47 UTC
e31600b03fc33282a6916a2c58d5795d17706947
1 file changed
+1
-13
t/test-lib.sh
+1
-13
@@ -675,18 +675,6 @@ die () {
675
fi
676
}
677
678
-file_lineno () {
679
- test -z "$GIT_TEST_FRAMEWORK_SELFTEST" && test -n "$BASH" || return 0
680
- local i
681
- for i in ${!BASH_SOURCE[*]}
682
- do
683
- case $i,"${BASH_SOURCE[$i]##*/}" in
684
- 0,t[0-9]*.sh) echo "t/${BASH_SOURCE[$i]}:$LINENO: ${1+$1: }"; return;;
685
- *,t[0-9]*.sh) echo "t/${BASH_SOURCE[$i]}:${BASH_LINENO[$(($i-1))]}: ${1+$1: }"; return;;
686
- esac
687
- done
688
-}
689
-
678
GIT_EXIT_OK=
679
trap 'die' EXIT
680
# Disable '-x' tracing, because with some shells, notably dash, it
@@ -732,7 +720,7 @@ test_failure_ () {
720
write_junit_xml_testcase "$1" " $junit_insert"
721
fi
722
test_failure=$(($test_failure + 1))
735
- say_color error "$(file_lineno error)not ok $test_count - $1"
723
+ say_color error "not ok $test_count - $1"
724
shift
725
printf '%s\n' "$*" | sed -e 's/^/# /'
726
test "$immediate" = "" || { finalize_junit_xml; GIT_EXIT_OK=t; exit 1; }