1
0
mirror of https://github.com/systemd/systemd synced 2025-12-27 19:34:47 +01:00

Compare commits

...

3 Commits

Author SHA1 Message Date
Luca Boccassi
bf2d8c03c1
Merge pull request #17760 from mrc0mmand/revert-semaphore-timedated
Revert "semaphore: temporarily disable the timedated test suite"
2020-12-05 11:12:35 +00:00
Daan De Meyer
77f16dbd6d Don't assume /run/systemd exists when creating unit-root
When running tests in a mkosi container, /run/systemd might not
exist yet in the container which causes test-execute to fail.

Fixes #17842.
2020-12-05 11:11:58 +00:00
Frantisek Sumsal
6df7d18090 Revert "semaphore: temporarily disable the timedated test suite"
This reverts commit ed9192bb55e23c00bf9ba810a949e7ffe1bbe959.
2020-12-04 18:47:12 +01:00
2 changed files with 5 additions and 3 deletions

View File

@ -85,9 +85,6 @@ EOF
rm -rf debian/patches
# disable autopkgtests which are not for upstream
sed -i '/# NOUPSTREAM/ q' debian/tests/control
# temporarily disable timedated tests, as they cause timeouts
# see: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=975010
sed -i '/Tests:/s/timedated, //' debian/tests/control
# enable more unit tests
sed -i '/^CONFFLAGS =/ s/=/= --werror -Dtests=unsafe -Dsplit-usr=true -Dslow-tests=true -Dfuzz-tests=true -Dman=true /' debian/rules
# no orig tarball

View File

@ -1541,6 +1541,11 @@ int setup_namespace(
if (root_directory)
root = root_directory;
else {
/* /run/systemd should have been created by PID 1 early on already, but in some cases, like
* when running tests (test-execute), it might not have been created yet so let's make sure
* we create it if it doesn't already exist. */
(void) mkdir_p_label("/run/systemd", 0755);
/* Always create the mount namespace in a temporary directory, instead of operating
* directly in the root. The temporary directory prevents any mounts from being
* potentially obscured my other mounts we already applied.