| |
@@ -142,7 +142,7 @@
|
| |
" result: $result" \
|
| |
" logs:" \
|
| |
>> "$results"
|
| |
- for log in "$logfile_stdout" "$logfile_stderr"; do
|
| |
+ for log in "$logfile"; do
|
| |
if [ -f "$log" ]; then
|
| |
local prefixed_log="$STR_ARTIFACTS_DIR/${status}-$(basename $log)"
|
| |
mv -f "$log" "$prefixed_log"
|
| |
@@ -165,11 +165,9 @@
|
| |
export PATH="$PATH:$STR_WORKDIR"
|
| |
mkdir -p "$STR_ARTIFACTS_DIR"
|
| |
# add str_ prefix to test logs
|
| |
- logfile_stdout="$STR_ARTIFACTS_DIR/$(echo "str_$STR_TEST_NAME" | sed -e 's/\//-/g').log"
|
| |
- logfile_stderr="$STR_ARTIFACTS_DIR/$(echo "str_$STR_TEST_NAME" | sed -e 's/\//-/g')-err.log"
|
| |
- logfile_stdout="$(realpath "$logfile_stdout")"
|
| |
- logfile_stderr="$(realpath "$logfile_stderr")"
|
| |
- exec 3>&1 4>&2 1> >(tee -a "$logfile_stdout" >&3) 2> >(tee -a "$logfile_stderr" >&4)
|
| |
+ logfile="$STR_ARTIFACTS_DIR/$(echo "str_$STR_TEST_NAME" | sed -e 's/\//-/g').log"
|
| |
+ logfile="$(realpath "$logfile")"
|
| |
+ exec > >(tee -a "$logfile") 2>&1
|
| |
cd "$STR_WORKDIR"
|
| |
# Purpose to spawn new bash is to ignore -efu setting for current shell
|
| |
# Test command: run-basic-test -w wodir -c 'false; echo 123; echo 333 >&2; touch "123 123"; exit 43' -t my_test -a logs -v
|
| |
fix https://pagure.io/fedora-ci/general/issue/57