1
0
mirror of https://github.com/sstephenson/bats.git synced 2024-12-27 06:59:45 +01:00

Merge pull request #2 from Marthym/feature/run-dont-include-stderr

Feature/run dont include stderr
This commit is contained in:
Konstantin Gredeskoul 2018-11-28 20:16:42 -08:00 committed by GitHub
commit 1e2303424a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 30 additions and 3 deletions

View File

@ -48,17 +48,25 @@ load() {
}
run() {
local e E T oldIFS
local e E T oldIFS
[[ ! "$-" =~ e ]] || e=1
[[ ! "$-" =~ E ]] || E=1
[[ ! "$-" =~ T ]] || T=1
set +e
set +E
set +T
output="$("$@" 2>&1)"
status="$?"
eval "$({ t_sdterr=$({ t_stdout=$("$@"); t_ret=$?; } 2>&1; declare -p t_stdout >&2; declare -pi t_ret >&2); declare -p t_sdterr; } 2>&1)"
status=$t_ret
output="${t_stdout}${t_sdterr}"
stdout=$t_stdout
stderr=$t_sdterr
oldIFS=$IFS
IFS=$'\n' lines=($output)
IFS=$'\n' stdlines=($t_stdout)
IFS=$'\n' errlines=($t_sdterr)
[ -z "$e" ] || set -e
[ -z "$E" ] || set -E
[ -z "$T" ] || set -T

View File

@ -262,3 +262,8 @@ fixtures bats
[ $status -eq 0 ]
[ "${lines[1]}" = "ok 1 loop_func" ]
}
@test "testing stdout and stderr are separated" {
run bats "$FIXTURE_ROOT/stdout_stderr_separate.bats"
[ $status -eq 0 ]
}

View File

@ -0,0 +1,14 @@
# see issue #89
echo_std_err() {
echo "std output"
(>&2 echo "err output")
return 0
}
@test "std err" {
run echo_std_err
[ $status -eq 0 ]
[ "${stdout}" = "std output" ]
[ "${stderr}" = "err output" ]
[ "${output}" = "std outputerr output" ]
}