X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Funit%2Ftest_session.c;h=507f665e02e13fdbb4f24565286b7929af8d8372;hb=f7c3ffd79ddcece895eb0de616001d549aced5fc;hp=b538bddc6bac261ca2a6615d065ebcce11b71126;hpb=3517bb6841bfddf35ef13f173055c53fad5fc16a;p=lttng-tools.git

diff --git a/tests/unit/test_session.c b/tests/unit/test_session.c
index b538bddc6..507f665e0 100644
--- 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"
@@ -132,7 +128,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 */
@@ -216,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;
 
@@ -255,7 +251,7 @@ end:
 	session_unlock_list();
 }
 
-void test_destroy_session(void)
+static void test_destroy_session(void)
 {
 	struct ltt_session *tmp;
 
@@ -275,20 +271,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) {
@@ -306,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;