Fix: track-untrack.c: regression of `--all --pid` option ordering

[lttng-tools.git] / tests / unit / test_session.c

diff --git a/tests/unit/test_session.c b/tests/unit/test_session.c
index c7ad4ec71be3d70b87100be069bab9c328d1c445..4e659d5242b6af9f1fdf5ee91ac5e711159d33e7 100644 (file)
--- a/tests/unit/test_session.c
+++ b/tests/unit/test_session.c
@@ -132,7 +132,7 @@ static int create_one_session(char *name)
        struct ltt_session *session = NULL;
 
        session_lock_list();
-       ret_code = session_create(name, geteuid(), getegid(), NULL, &session);
+       ret_code = session_create(name, geteuid(), getegid(), &session);
        session_put(session);
        if (ret_code == LTTNG_OK) {
                /* Validate */
@@ -141,21 +141,17 @@ static int create_one_session(char *name)
                        /* Session not found by name */
                        printf("session not found after creation\n");
                        ret = -1;
-                       goto end;
                } else {
                        /* Success */
                        ret = 0;
-                       goto end;
                }
        } else {
                if (ret_code == LTTNG_ERR_EXIST_SESS) {
                        printf("(session already exists) ");
                }
                ret = -1;
-               goto end;
        }
-       ret = 0;
-end:
+
        session_unlock_list();
        return ret;
 }
@@ -220,20 +216,20 @@ end:
        return ret;
 }
 
-void test_session_list(void)
+static void test_session_list(void)
 {
        session_list = session_get_list();
        ok(session_list != NULL, "Session list: not NULL");
 }
 
-void test_create_one_session(void)
+static void test_create_one_session(void)
 {
        ok(create_one_session(SESSION1) == 0,
           "Create session: %s",
           SESSION1);
 }
 
-void test_validate_session(void)
+static void test_validate_session(void)
 {
        struct ltt_session *tmp;
 
@@ -259,7 +255,7 @@ end:
        session_unlock_list();
 }
 
-void test_destroy_session(void)
+static void test_destroy_session(void)
 {
        struct ltt_session *tmp;
 
@@ -279,20 +275,20 @@ void test_destroy_session(void)
        session_unlock_list();
 }
 
-void test_duplicate_session(void)
+static void test_duplicate_session(void)
 {
        ok(two_session_same_name() == 0,
           "Duplicate session creation");
 }
 
-void test_session_name_generation(void)
+static void test_session_name_generation(void)
 {
        struct ltt_session *session = NULL;
        enum lttng_error_code ret_code;
        const char *expected_session_name_prefix = DEFAULT_SESSION_NAME;
 
        session_lock_list();
-       ret_code = session_create(NULL, geteuid(), getegid(), NULL, &session);
+       ret_code = session_create(NULL, geteuid(), getegid(), &session);
        ok(ret_code == LTTNG_OK,
                "Create session with a NULL name (auto-generate a name)");
        if (!session) {
@@ -310,7 +306,7 @@ end:
        session_unlock_list();
 }
 
-void test_large_session_number(void)
+static void test_large_session_number(void)
 {
        int ret, i, failed = 0;
        struct ltt_session *iter, *tmp;