valicek/bats
1
0
Fork 0
mirror of https://github.com/sstephenson/bats.git synced 2024-12-26 14:39:46 +01:00
Code Issues Releases Wiki Activity

Split print_failed_command from print_stack_trace

Browse Source
This commit is contained in:
Sam Stephenson 2014-08-12 15:04:18 -05:00
parent c010220e7a
commit ec6fbc10f1
1 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
libexec/bats-exec-test
View File

@ -118,23 +118,20 @@ bats_capture_stack_trace() {
bats_print_stack_trace() { bats_print_stack_trace() {
local frame local frame
local filename
local lineno
local index=1 local index=1
local count="${#@}" local count="${#@}"
local failed_line
for frame in "$@"; do for frame in "$@"; do
local filename
if [ $index -eq $count ]; then if [ $index -eq $count ]; then
filename="$BATS_TEST_FILENAME" filename="$BATS_TEST_FILENAME"
else else
filename="$(bats_frame_filename "$frame")" filename="$(bats_frame_filename "$frame")"
fi fi
lineno="$(bats_frame_lineno "$frame")" local lineno="$(bats_frame_lineno "$frame")"
if [ $index -eq 1 ]; then if [ $index -eq 1 ]; then
failed_line="$(bats_extract_line "$filename" "$lineno")"
echo -n "# (" echo -n "# ("
else else
echo -n "# " echo -n "# "
@ -146,9 +143,7 @@ bats_print_stack_trace() {
fi fi
if [ $index -eq $count ]; then if [ $index -eq $count ]; then
local failed_command="$(bats_strip_string "$failed_line")"
echo "in test file $filename, line $lineno)" echo "in test file $filename, line $lineno)"
echo "# \`${failed_command}' failed"
else else
echo "in file $filename, line $lineno," echo "in file $filename, line $lineno,"
fi fi
@ -157,6 +152,24 @@ bats_print_stack_trace() {
done done
} }
bats_print_failed_command() {
local frame="$1"
local count="${#@}"
local filename
if [ $count -eq 1 ]; then
filename="$BATS_TEST_FILENAME"
else
filename="$(bats_frame_filename "$frame")"
fi
local lineno="$(bats_frame_lineno "$frame")"
local failed_line="$(bats_extract_line "$filename" "$lineno")"
local failed_command="$(bats_strip_string "$failed_line")"
echo "# \`${failed_command}' failed"
}
bats_frame_lineno() { bats_frame_lineno() {
local frame="$1" local frame="$1"
local lineno="${frame%% *}" local lineno="${frame%% *}"
@ -230,6 +243,7 @@ bats_exit_trap() {
if [ -z "$BATS_TEST_COMPLETED" ] || [ -z "$BATS_TEARDOWN_COMPLETED" ]; then if [ -z "$BATS_TEST_COMPLETED" ] || [ -z "$BATS_TEARDOWN_COMPLETED" ]; then
echo "not ok $BATS_TEST_NUMBER $BATS_TEST_DESCRIPTION" >&3 echo "not ok $BATS_TEST_NUMBER $BATS_TEST_DESCRIPTION" >&3
bats_print_stack_trace "${BATS_ERROR_STACK_TRACE[@]}" >&3 bats_print_stack_trace "${BATS_ERROR_STACK_TRACE[@]}" >&3
bats_print_failed_command "${BATS_ERROR_STACK_TRACE[@]}" >&3
sed -e "s/^/# /" < "$BATS_OUT" >&3 sed -e "s/^/# /" < "$BATS_OUT" >&3
status=1 status=1
else else