X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Funit%2Ftest_session.c;h=7c925908d326f18443c3e2184a50a8c430abb723;hp=8e1da214806d105975bc5853270a68444246da03;hb=9354f1d04c5e433da72d0b466f661e30e548097c;hpb=dec56f6cc894de41b312354d360b6a4c09fc199d

diff --git a/tests/unit/test_session.c b/tests/unit/test_session.c
index 8e1da2148..7c925908d 100644
--- a/tests/unit/test_session.c
+++ b/tests/unit/test_session.c
@@ -16,7 +16,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#define _GNU_SOURCE
 #include <assert.h>
 #include <errno.h>
 #include <stdio.h>
@@ -43,9 +42,10 @@
 
 static struct ltt_session_list *session_list;
 
-/* For lttngerr.h */
+/* For error.h */
 int lttng_opt_quiet = 1;
 int lttng_opt_verbose = 0;
+int lttng_opt_mi;
 
 int ust_consumerd32_fd;
 int ust_consumerd64_fd;
@@ -108,8 +108,7 @@ static void empty_session_list(void)
 	struct ltt_session *iter, *tmp;
 
 	cds_list_for_each_entry_safe(iter, tmp, &session_list->head, list) {
-		cds_list_del(&iter->list);
-		free(iter);
+		session_destroy(iter);
 	}
 
 	/* Session list must be 0 */
@@ -151,15 +150,14 @@ static int create_one_session(char *name)
 static int destroy_one_session(struct ltt_session *session)
 {
 	int ret;
+	char session_name[NAME_MAX];
 
-	ret = session_destroy(session);
+	strncpy(session_name, session->name, sizeof(session->name));
+	session_name[sizeof(session_name) - 1] = '\0';
 
+	ret = session_destroy(session);
 	if (ret == LTTNG_OK) {
-		/* Validate */
-		if (session == NULL) {
-			return 0;
-		}
-		ret = find_session_name(session->name);
+		ret = find_session_name(session_name);
 		if (ret < 0) {
 			/* Success, -1 means that the sesion is NOT found */
 			return 0;
@@ -280,7 +278,7 @@ void test_large_session_number(void)
 		cds_list_for_each_entry_safe(iter, tmp, &session_list->head, list) {
 			ret = destroy_one_session(iter);
 			if (ret < 0) {
-				diag("session %d (name: %s) destroy failed", i, iter->name);
+				diag("session %d destroy failed", i);
 				++failed;
 			}
 		}