]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
tests: don't silently skip `test-namespace` 3011/head
authorEvgeny Vereshchagin <evvers@ya.ru>
Sun, 10 Apr 2016 23:41:04 +0000 (23:41 +0000)
committerEvgeny Vereshchagin <evvers@ya.ru>
Sun, 10 Apr 2016 23:41:04 +0000 (23:41 +0000)
src/test/test-namespace.c

index 0b2f9e9173fa7cbb902a918db93a66ec517db2c1..ff9f35cecd2adebb4866be237488b0d92be7ef73 100644 (file)
@@ -69,8 +69,10 @@ static void test_netns(void) {
         int r, n = 0;
         siginfo_t si;
 
-        if (geteuid() > 0)
-                return;
+        if (geteuid() > 0) {
+                log_info("Skipping test: not root");
+                exit(EXIT_TEST_SKIP);
+        }
 
         assert_se(socketpair(AF_UNIX, SOCK_DGRAM, 0, s) >= 0);
 
@@ -124,6 +126,9 @@ int main(int argc, char *argv[]) {
         char boot_id[SD_ID128_STRING_MAX];
         _cleanup_free_ char *x = NULL, *y = NULL, *z = NULL, *zz = NULL;
 
+        log_parse_environment();
+        log_open();
+
         assert_se(sd_id128_get_boot(&bid) >= 0);
         sd_id128_to_string(bid, boot_id);