1
1
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-22 13:33:56 +03:00

test: perform partial cleanup after each test is run

This causes the unprivileged-nspawn-root directory to be removed
after running one test. The advantage is that we reduce the maximum
disk-space use quite a bit (47*400 MB → about 18GB).
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2020-03-20 19:09:35 +01:00
parent 108d00a6b2
commit 693ad298e9
2 changed files with 14 additions and 2 deletions

View File

@ -6,7 +6,7 @@ if [ $# -gt 0 ]; then
args="$@"
do_clean=0
else
args="setup run"
args="setup run clean-again"
do_clean=1
fi

View File

@ -1104,6 +1104,8 @@ setup_nspawn_root() {
exit 1
fi
rm -rf "$TESTDIR/unprivileged-nspawn-root"
if [[ "$RUN_IN_UNPRIVILEGED_CONTAINER" = "yes" ]]; then
ddebug "cp -ar $initdir $TESTDIR/unprivileged-nspawn-root"
cp -ar $initdir $TESTDIR/unprivileged-nspawn-root
@ -1936,6 +1938,12 @@ test_cleanup() {
_test_cleanup
}
test_cleanup_again() {
[ -n "$TESTDIR" ] || return
rm -rf "$TESTDIR/unprivileged-nspawn-root"
umount_initdir
}
test_create_image() {
create_empty_image_rootdir
@ -2039,10 +2047,14 @@ do_test() {
test_setup
test_setup_cleanup
;;
--clean|--clean-again)
--clean)
echo "TEST CLEANUP: $TEST_DESCRIPTION"
test_cleanup
;;
--clean-again)
echo "TEST CLEANUP AGAIN: $TEST_DESCRIPTION"
test_cleanup_again
;;
--all)
ret=0
echo -n "TEST: $TEST_DESCRIPTION "