diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2021-01-29 14:07:54 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-29 14:07:54 +0100 |
| commit | 0c3c9a4096dbf0ae1025db003ca595f0c497970a (patch) | |
| tree | 7fd068c8e68999a1b65233d090e0a9984e35e788 /test | |
| parent | ddc155b2fd7807cda088c437dc836eebbcf79cea (diff) | |
| parent | 21be71eefb0b5845a3238c7ceff3a3c2efb97aa0 (diff) | |
| download | systemd-0c3c9a4096dbf0ae1025db003ca595f0c497970a.tar.gz | |
Merge pull request #18395 from bluca/make_docs_img_clean
Add Python 3.7 compat in update-dbus-docs and fix regression in integration tests 'make clean'
Diffstat (limited to 'test')
| -rw-r--r-- | test/test-functions | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/test/test-functions b/test/test-functions index a9341445d5..df6022982c 100644 --- a/test/test-functions +++ b/test/test-functions @@ -2088,6 +2088,10 @@ _test_cleanup() { set +e _umount_dir $initdir rm -vf "$IMAGE_PUBLIC" + # If multiple setups/cleans are ran in parallel, this can cause a race + if [ ${TEST_PARALLELIZE} -ne 1 ]; then + rm -vf "${IMAGESTATEDIR}/default.img" + fi rm -vfr "$TESTDIR" rm -vf "$STATEFILE" ) || : |