X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=tests%2Funit%2Ftest_session.c;h=4fc23791e0737f46b45878aa17e8471f2b0d80df;hb=a0377dfefe40662ba7d68617bce6ff467114136c;hp=2103a8f46634b2a46844625e93a89133f9f04366;hpb=b53d4e59bf0a980aa774dcccc27123986e77b8ff;p=lttng-tools.git

diff --git a/tests/unit/test_session.c b/tests/unit/test_session.c
index 2103a8f46..4fc23791e 100644
--- a/tests/unit/test_session.c
+++ b/tests/unit/test_session.c
@@ -5,8 +5,6 @@
  *
  */
 
-#include <assert.h>
-#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -17,6 +15,7 @@
 
 #include <tap/tap.h>
 
+#include <common/compat/errno.h>
 #include <bin/lttng-sessiond/session.h>
 #include <bin/lttng-sessiond/ust-app.h>
 #include <bin/lttng-sessiond/ht-cleanup.h>
@@ -35,11 +34,6 @@
 
 static struct ltt_session_list *session_list;
 
-/* For error.h */
-int lttng_opt_quiet = 1;
-int lttng_opt_verbose = 0;
-int lttng_opt_mi;
-
 static const char alphanum[] =
 	"0123456789"
 	"ABCDEFGHIJKLMNOPQRSTUVWXYZ"
@@ -104,7 +98,7 @@ static void empty_session_list(void)
 	session_unlock_list();
 
 	/* Session list must be 0 */
-	assert(!session_list_count());
+	LTTNG_ASSERT(!session_list_count());
 }
 
 /*
@@ -314,7 +308,7 @@ static void test_large_session_number(void)
 	session_lock_list();
 	for (i = 0; i < MAX_SESSIONS; i++) {
 		cds_list_for_each_entry_safe(iter, tmp, &session_list->head, list) {
-			assert(session_get(iter));
+			LTTNG_ASSERT(session_get(iter));
 			ret = destroy_one_session(iter);
 			if (ret < 0) {
 				diag("session %d destroy failed", i);
@@ -335,9 +329,9 @@ int main(int argc, char **argv)
 
 	plan_tests(NUM_TESTS);
 
-	health_sessiond = health_app_create(NR_HEALTH_SESSIOND_TYPES);
+	the_health_sessiond = health_app_create(NR_HEALTH_SESSIOND_TYPES);
 	ht_cleanup_thread = launch_ht_cleanup_thread();
-	assert(ht_cleanup_thread);
+	LTTNG_ASSERT(ht_cleanup_thread);
 	lttng_thread_put(ht_cleanup_thread);
 
 	diag("Sessions unit tests");