diff options
| -rw-r--r-- | TODO | 2 | ||||
| -rw-r--r-- | src/basic/exit-status.c | 1 | ||||
| -rw-r--r-- | src/import/pull.c | 16 | ||||
| -rw-r--r-- | src/test/test-barrier.c | 10 |
4 files changed, 21 insertions, 8 deletions
@@ -28,6 +28,8 @@ External: Features: +* man: document that unless you use StandardError=null the shell >/dev/stderr won't work in shell scripts in services + * man: clarify that "machinectl show" shows different information than "machinectl status" (no cgroup tree, no IP addresses, ...) * "systemctl daemon-reload" should result in /etc/systemd/system.conf being reloaded by systemd diff --git a/src/basic/exit-status.c b/src/basic/exit-status.c index c09efdd2cb..5ab36825c0 100644 --- a/src/basic/exit-status.c +++ b/src/basic/exit-status.c @@ -20,6 +20,7 @@ ***/ #include <stdlib.h> +#include <signal.h> #include "exit-status.h" #include "set.h" diff --git a/src/import/pull.c b/src/import/pull.c index ca33d2f3fa..ca7be6be85 100644 --- a/src/import/pull.c +++ b/src/import/pull.c @@ -245,15 +245,15 @@ static int pull_dkr(int argc, char *argv[], void *userdata) { if (digest) { reference = digest + 1; name = strndupa(argv[1], digest - argv[1]); - } - - reference = strchr(argv[1], ':'); - if (reference) { - name = strndupa(argv[1], reference - argv[1]); - reference++; } else { - name = argv[1]; - reference = "latest"; + reference = strchr(argv[1], ':'); + if (reference) { + name = strndupa(argv[1], reference - argv[1]); + reference++; + } else { + name = argv[1]; + reference = "latest"; + } } if (!dkr_name_is_valid(name)) { diff --git a/src/test/test-barrier.c b/src/test/test-barrier.c index 2d109a30e7..f37cb49c85 100644 --- a/src/test/test-barrier.c +++ b/src/test/test-barrier.c @@ -438,6 +438,16 @@ TEST_BARRIER(test_barrier_pending_exit, TEST_BARRIER_WAIT_SUCCESS(pid2)); int main(int argc, char *argv[]) { + /* + * This test uses real-time alarms and sleeps to test for CPU races + * explicitly. This is highly fragile if your system is under load. We + * already increased the BASE_TIME value to make the tests more robust, + * but that just makes the test take significantly longer. Hence, + * disable the test by default, so it will not break CI. + */ + if (argc < 2) + return EXIT_TEST_SKIP; + log_parse_environment(); log_open(); |