From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Fri, 18 Nov 2016 01:57:22 +0000 (-0500)
Subject: test-ipcrm: skip test if nfsnobody is missing
X-Git-Tag: v233~408^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5c7119f43e8ae91d4310838f7ddd8b05d0eece32;p=thirdparty%2Fsystemd.git

test-ipcrm: skip test if nfsnobody is missing
---

diff --git a/src/test/test-ipcrm.c b/src/test/test-ipcrm.c
index 551eba7215d..463e135e2b0 100644
--- a/src/test/test-ipcrm.c
+++ b/src/test/test-ipcrm.c
@@ -28,9 +28,11 @@ int main(int argc, char *argv[]) {
 
         r = get_user_creds(&name, &uid, NULL, NULL, NULL);
         if (r < 0) {
-                log_error_errno(r, "Failed to resolve \"%s\": %m", name);
-                return EXIT_FAILURE;
+                log_full_errno(r == -ESRCH ? LOG_NOTICE : LOG_ERR,
+                               r, "Failed to resolve \"%s\": %m", name);
+                return r == -ESRCH ? EXIT_TEST_SKIP : EXIT_FAILURE;
         }
 
-        return clean_ipc_by_uid(uid) < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
+        r = clean_ipc_by_uid(uid);
+        return  r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
 }