kdbus: test suite changed to common format

[platform/kernel/linux-rpi.git] / tools / testing / selftests / kdbus / test-bus.c

diff --git a/tools/testing/selftests/kdbus/test-bus.c b/tools/testing/selftests/kdbus/test-bus.c
index 762fb30..85fb222 100644 (file)
--- a/tools/testing/selftests/kdbus/test-bus.c
+++ b/tools/testing/selftests/kdbus/test-bus.c
@@ -16,7 +16,7 @@
 #include "kdbus-enum.h"
 #include "kdbus-test.h"
 
-static struct kdbus_item *kdbus_get_item(struct kdbus_info *info,
+static wur struct kdbus_item *kdbus_get_item(struct kdbus_info *info,
                                         uint64_t type)
 {
        struct kdbus_item *item;
@@ -28,7 +28,7 @@ static struct kdbus_item *kdbus_get_item(struct kdbus_info *info,
        return NULL;
 }
 
-static int test_bus_creator_info(const char *bus_path)
+static wur int test_bus_creator_info(const char *bus_path)
 {
        int ret;
        uint64_t offset;
@@ -39,35 +39,34 @@ static int test_bus_creator_info(const char *bus_path)
 
        /* extract the bus-name from @bus_path */
        tmp = strdup(bus_path);
-       ASSERT_RETURN(tmp);
+       ASSERT_NONZERO(tmp);
        busname = strrchr(tmp, '/');
-       ASSERT_RETURN(busname);
+       ASSERT_NONZERO(busname);
        *busname = 0;
        busname = strrchr(tmp, '/');
-       ASSERT_RETURN(busname);
+       ASSERT_NONZERO(busname);
        ++busname;
 
        conn = kdbus_hello(bus_path, 0, NULL, 0);
-       ASSERT_RETURN(conn);
+       ASSERT_NONZERO(conn);
 
-       ret = kdbus_bus_creator_info(conn, _KDBUS_ATTACH_ALL, &offset);
-       ASSERT_RETURN(ret == 0);
+       ASSERT_ZERO(kdbus_bus_creator_info(conn, _KDBUS_ATTACH_ALL, &offset));
 
        info = (struct kdbus_info *)(conn->buf + offset);
 
        item = kdbus_get_item(info, KDBUS_ITEM_MAKE_NAME);
-       ASSERT_RETURN(item);
-       ASSERT_RETURN(!strcmp(item->str, busname));
+       ASSERT_NONZERO(item);
+       ASSERT_ZERO(strcmp(item->str, busname));
 
        ret = kdbus_free(conn, offset);
-       ASSERT_RETURN_VAL(ret == 0, ret);
+       ASSERT_RETURN_VAL(ret,==,0, ret);
 
        free(tmp);
        kdbus_conn_free(conn);
        return 0;
 }
 
-int kdbus_test_bus_make(struct kdbus_test_env *env)
+wur int kdbus_test_bus_make(struct kdbus_test_env *env)
 {
        struct {
                struct kdbus_cmd cmd;
@@ -85,18 +84,18 @@ int kdbus_test_bus_make(struct kdbus_test_env *env)
                char name[64];
        } bus_make;
        char s[PATH_MAX], *name;
-       int ret, control_fd2;
+       int control_fd2;
        uid_t uid;
 
        name = unique_name("");
-       ASSERT_RETURN(name);
+       ASSERT_NONZERO(name);
 
        snprintf(s, sizeof(s), "%s/control", env->root);
        env->control_fd = open(s, O_RDWR|O_CLOEXEC);
-       ASSERT_RETURN(env->control_fd >= 0);
+       ASSERT_RETURN(env->control_fd,>=,0);
 
        control_fd2 = open(s, O_RDWR|O_CLOEXEC);
-       ASSERT_RETURN(control_fd2 >= 0);
+       ASSERT_RETURN(control_fd2,>=,0);
 
        memset(&bus_make, 0, sizeof(bus_make));
 
@@ -114,41 +113,35 @@ int kdbus_test_bus_make(struct kdbus_test_env *env)
        bus_make.n_size = KDBUS_ITEM_HEADER_SIZE + strlen(bus_make.name) + 1;
        bus_make.cmd.size = sizeof(struct kdbus_cmd) +
                            sizeof(bus_make.bs) + bus_make.n_size;
-       ret = kdbus_cmd_bus_make(env->control_fd, &bus_make.cmd);
-       ASSERT_RETURN(ret == -EINVAL);
+       ASSERT_RETURN(-EINVAL,==,kdbus_cmd_bus_make(env->control_fd, &bus_make.cmd));
 
        /* non alphanumeric character */
        snprintf(bus_make.name, sizeof(bus_make.name), "%u-blah@123", uid);
        bus_make.n_size = KDBUS_ITEM_HEADER_SIZE + strlen(bus_make.name) + 1;
        bus_make.cmd.size = sizeof(struct kdbus_cmd) +
                            sizeof(bus_make.bs) + bus_make.n_size;
-       ret = kdbus_cmd_bus_make(env->control_fd, &bus_make.cmd);
-       ASSERT_RETURN(ret == -EINVAL);
+       ASSERT_RETURN(-EINVAL,==,kdbus_cmd_bus_make(env->control_fd, &bus_make.cmd));
 
        /* '-' at the end */
        snprintf(bus_make.name, sizeof(bus_make.name), "%u-blah-", uid);
        bus_make.n_size = KDBUS_ITEM_HEADER_SIZE + strlen(bus_make.name) + 1;
        bus_make.cmd.size = sizeof(struct kdbus_cmd) +
                            sizeof(bus_make.bs) + bus_make.n_size;
-       ret = kdbus_cmd_bus_make(env->control_fd, &bus_make.cmd);
-       ASSERT_RETURN(ret == -EINVAL);
+       ASSERT_RETURN(-EINVAL,==,kdbus_cmd_bus_make(env->control_fd, &bus_make.cmd));
 
        /* create a new bus */
        snprintf(bus_make.name, sizeof(bus_make.name), "%u-%s-1", uid, name);
        bus_make.n_size = KDBUS_ITEM_HEADER_SIZE + strlen(bus_make.name) + 1;
        bus_make.cmd.size = sizeof(struct kdbus_cmd) +
                            sizeof(bus_make.bs) + bus_make.n_size;
-       ret = kdbus_cmd_bus_make(env->control_fd, &bus_make.cmd);
-       ASSERT_RETURN(ret == 0);
+       ASSERT_ZERO(kdbus_cmd_bus_make(env->control_fd, &bus_make.cmd));
 
-       ret = kdbus_cmd_bus_make(control_fd2, &bus_make.cmd);
-       ASSERT_RETURN(ret == -EEXIST);
+       ASSERT_RETURN(-EEXIST,==,kdbus_cmd_bus_make(control_fd2, &bus_make.cmd));
 
        snprintf(s, sizeof(s), "%s/%u-%s-1/bus", env->root, uid, name);
-       ASSERT_RETURN(access(s, F_OK) == 0);
+       ASSERT_ZERO(access(s, F_OK));
 
-       ret = test_bus_creator_info(s);
-       ASSERT_RETURN(ret == 0);
+       ASSERT_ZERO(test_bus_creator_info(s));
 
        /* can't use the same fd for bus make twice, even though a different
         * bus name is used
@@ -157,18 +150,16 @@ int kdbus_test_bus_make(struct kdbus_test_env *env)
        bus_make.n_size = KDBUS_ITEM_HEADER_SIZE + strlen(bus_make.name) + 1;
        bus_make.cmd.size = sizeof(struct kdbus_cmd) +
                            sizeof(bus_make.bs) + bus_make.n_size;
-       ret = kdbus_cmd_bus_make(env->control_fd, &bus_make.cmd);
-       ASSERT_RETURN(ret == -EBADFD);
+       ASSERT_RETURN(-EBADFD,==,kdbus_cmd_bus_make(env->control_fd, &bus_make.cmd));
 
        /* create a new bus, with different fd and different bus name */
        snprintf(bus_make.name, sizeof(bus_make.name), "%u-%s-2", uid, name);
        bus_make.n_size = KDBUS_ITEM_HEADER_SIZE + strlen(bus_make.name) + 1;
        bus_make.cmd.size = sizeof(struct kdbus_cmd) +
                            sizeof(bus_make.bs) + bus_make.n_size;
-       ret = kdbus_cmd_bus_make(control_fd2, &bus_make.cmd);
-       ASSERT_RETURN(ret == 0);
+       ASSERT_ZERO(kdbus_cmd_bus_make(control_fd2, &bus_make.cmd));
 
-       close(control_fd2);
+       CLOSE(control_fd2);
        free(name);
 
        return TEST_OK;