ci/lib: support custom output directories when creating test artifacts
Update `create_failed_test_artifacts ()` so that it can handle arbitrary test output directories. This fixes creation of these artifacts for macOS on GitLab CI, which uses a separate output directory already. This will also be used by our out-of-tree builds with Meson. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:

committed by
Junio C Hamano

parent
5c46677067
commit
714c134dd6
12
ci/lib.sh
12
ci/lib.sh
@ -180,9 +180,9 @@ handle_failed_tests () {
|
||||
}
|
||||
|
||||
create_failed_test_artifacts () {
|
||||
mkdir -p t/failed-test-artifacts
|
||||
mkdir -p "${TEST_OUTPUT_DIRECTORY:-t}"/failed-test-artifacts
|
||||
|
||||
for test_exit in t/test-results/*.exit
|
||||
for test_exit in "${TEST_OUTPUT_DIRECTORY:-t}"/test-results/*.exit
|
||||
do
|
||||
test 0 != "$(cat "$test_exit")" || continue
|
||||
|
||||
@ -191,11 +191,11 @@ create_failed_test_artifacts () {
|
||||
printf "\\e[33m\\e[1m=== Failed test: ${test_name} ===\\e[m\\n"
|
||||
echo "The full logs are in the 'print test failures' step below."
|
||||
echo "See also the 'failed-tests-*' artifacts attached to this run."
|
||||
cat "t/test-results/$test_name.markup"
|
||||
cat "${TEST_OUTPUT_DIRECTORY:-t}/test-results/$test_name.markup"
|
||||
|
||||
trash_dir="t/trash directory.$test_name"
|
||||
cp "t/test-results/$test_name.out" t/failed-test-artifacts/
|
||||
tar czf t/failed-test-artifacts/"$test_name".trash.tar.gz "$trash_dir"
|
||||
trash_dir="${TEST_OUTPUT_DIRECTORY:-t}/trash directory.$test_name"
|
||||
cp "${TEST_OUTPUT_DIRECTORY:-t}/test-results/$test_name.out" "${TEST_OUTPUT_DIRECTORY:-t}"/failed-test-artifacts/
|
||||
tar czf "${TEST_OUTPUT_DIRECTORY:-t}/failed-test-artifacts/$test_name.trash.tar.gz" "$trash_dir"
|
||||
done
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user