shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-09 12:58:26 +03:00
Code

Merge pull request #31868 from bluca/test_cleanup

Browse Source 
test: delete private images on clean-again
This commit is contained in:
Luca Boccassi 2024-03-21 23:45:49 +00:00 committed by GitHub
commit 9773f5860f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
test/run-integration-tests.sh
View File

@ -118,14 +118,12 @@ if [[ ${#ARGS[@]} -ne 0 ]]; then
RESULTS["$test"]="$result"
TIMES["$test"]="$SECONDS"
[[ "$result" -ne 0 ]] && FAILURES=$((FAILURES + 1))
done
fi
# Run clean-again, if requested, and if no tests failed
if [[ $FAILURES -eq 0 && $CLEAN_AGAIN -eq 1 ]]; then
for test in "${!RESULTS[@]}"; do
test_run "$test" make -C "$test" clean-again
# Run clean-again here to free up space, if requested, and if the test succeeded
if [[ "$result" -ne 0 ]]; then
FAILURES=$((FAILURES + 1))
elif [[ $CLEAN_AGAIN -eq 1 ]]; then
test_run "$test" make -C "$test" clean-again
fi
done
fi

7
test/test-functions
View File

@ -3338,6 +3338,13 @@ test_cleanup_again() {
[ -n "$TESTDIR" ] || return
rm -rf "$TESTDIR/unprivileged-nspawn-root"
[[ -n "$initdir" ]] && _umount_dir "$initdir"
# Test specific images are not reused, so delete them or we run out of disk space
if [[ -n "$IMAGE_PUBLIC" ]] && [ "$(basename "$IMAGE_PUBLIC")" != "default.img" ]; then
rm -vf "$IMAGE_PUBLIC"
fi
if [[ -n "$IMAGE_PRIVATE" ]] && [ "$(basename "$IMAGE_PRIVATE")" != "default.img" ]; then
rm -vf "$IMAGE_PRIVATE"
fi
}
test_create_image() {