Fix: build failure with -fno-common

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

diff --git a/tests/unit/test_session.c b/tests/unit/test_session.c
index cdb1bb88d7046cbe46218324db8031deddde00d1..507f665e02e13fdbb4f24565286b7929af8d8372 100644 (file)
--- a/tests/unit/test_session.c
+++ b/tests/unit/test_session.c
@@ -44,7 +44,6 @@
 /* Number of TAP tests in this file */
 #define NUM_TESTS 11
 
-struct health_app *health_sessiond;
 static struct ltt_session_list *session_list;
 
 /* For error.h */
@@ -52,9 +51,6 @@ int lttng_opt_quiet = 1;
 int lttng_opt_verbose = 0;
 int lttng_opt_mi;
 
-int ust_consumerd32_fd;
-int ust_consumerd64_fd;
-
 static const char alphanum[] =
        "0123456789"
        "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
@@ -141,21 +137,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 +212,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 +251,7 @@ end:
        session_unlock_list();
 }
 
-void test_destroy_session(void)
+static void test_destroy_session(void)
 {
        struct ltt_session *tmp;
 
@@ -279,13 +271,13 @@ 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;
@@ -310,7 +302,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;