X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Funit%2Ftest_session.c;h=4e659d5242b6af9f1fdf5ee91ac5e711159d33e7;hp=fa3e367d20b121f5a7da4dfbb8e73a041d483eaf;hb=c109c263a5bf6c52d3a1cf27e26a784fb28fac07;hpb=b178f53e90c376dd44b020535c32649edef8f80e

diff --git a/tests/unit/test_session.c b/tests/unit/test_session.c
index fa3e367d2..4e659d524 100644
--- a/tests/unit/test_session.c
+++ b/tests/unit/test_session.c
@@ -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;
 
@@ -243,17 +239,23 @@ void test_validate_session(void)
 	ok(tmp != NULL,
 	   "Validating session: session found");
 
-	ok(tmp->kernel_session == NULL &&
-	   strlen(tmp->name),
-	   "Validating session: basic sanity check");
+	if (tmp) {
+		ok(tmp->kernel_session == NULL &&
+		   strlen(tmp->name),
+		   "Validating session: basic sanity check");
+	} else {
+		skip(1, "Skipping session validation check as session was not found");
+		goto end;
+	}
 
 	session_lock(tmp);
 	session_unlock(tmp);
 	session_put(tmp);
+end:
 	session_unlock_list();
 }
 
-void test_destroy_session(void)
+static void test_destroy_session(void)
 {
 	struct ltt_session *tmp;
 
@@ -263,19 +265,23 @@ void test_destroy_session(void)
 	ok(tmp != NULL,
 	   "Destroying session: session found");
 
-	ok(destroy_one_session(tmp) == 0,
-	   "Destroying session: %s destroyed",
-	   SESSION1);
+	if (tmp) {
+		ok(destroy_one_session(tmp) == 0,
+		   "Destroying session: %s destroyed",
+		   SESSION1);
+	} else {
+		skip(1, "Skipping session destruction as it was not found");
+	}
 	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;
@@ -300,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;