]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
test-ipcrm: skip test if nfsnobody is missing
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Fri, 18 Nov 2016 01:57:22 +0000 (20:57 -0500)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Fri, 18 Nov 2016 01:57:22 +0000 (20:57 -0500)
src/test/test-ipcrm.c

index 551eba7215dd4883c86cd10b89d8dc2e16112283..463e135e2b0f9e626c1f76e46078e66c2a878ae4 100644 (file)
@@ -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;
 }