cgroup: if we do a cgroup operation then do something on all supported controllers

[elogind.git] / src / journal / test-journal-interleaving.c

diff --git a/src/journal/test-journal-interleaving.c b/src/journal/test-journal-interleaving.c
index 069d297a9f77d7106218ad4d92b4b945fe5c609d..1a058eaedd2838d498648292ab3f3cb8c8b02c8a 100644 (file)
--- a/src/journal/test-journal-interleaving.c
+++ b/src/journal/test-journal-interleaving.c
@@ -36,7 +36,7 @@
 
 static bool arg_keep = false;
 
-static void log_assert_errno(const char *text, int eno, const char *file, int line, const char *func) {
+_noreturn_ static void log_assert_errno(const char *text, int eno, const char *file, int line, const char *func) {
         log_meta(LOG_CRIT, file, line, func,
                  "'%s' failed at %s:%u (%s): %s.",
                  text, file, line, func, strerror(eno));
@@ -288,6 +288,10 @@ static void test_sequence_numbers(void) {
 int main(int argc, char *argv[]) {
         log_set_max_level(LOG_DEBUG);
 
+        /* journal_file_open requires a valid machine id */
+        if (access("/etc/machine-id", F_OK) != 0)
+                return EXIT_TEST_SKIP;
+
         arg_keep = argc > 1;
 
         test_skip(setup_sequential);