Skip to content

Commit 282ce92

Browse files
committed
Merge branch 'cb/test-bash-lineno-fix'
Recent change to show files and line numbers of a breakage during test (only available when running the tests with bash) were hurting other shells with syntax errors, which has been corrected. * cb/test-bash-lineno-fix: t/test_lib: avoid naked bash arrays in file_lineno
2 parents 41eae3e + 303775a commit 282ce92

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

t/test-lib.sh

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -677,14 +677,16 @@ die () {
677677

678678
file_lineno () {
679679
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
680+
eval '
681+
local i
682+
for i in ${!BASH_SOURCE[*]}
683+
do
684+
case $i,"${BASH_SOURCE[$i]##*/}" in
685+
0,t[0-9]*.sh) echo "t/${BASH_SOURCE[$i]}:$LINENO: ${1+$1: }"; return;;
686+
*,t[0-9]*.sh) echo "t/${BASH_SOURCE[$i]}:${BASH_LINENO[$(($i-1))]}: ${1+$1: }"; return;;
687+
esac
688+
done
689+
'
688690
}
689691

690692
GIT_EXIT_OK=

0 commit comments

Comments
 (0)