X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Funit%2Ftest_session.c;h=675f710ae3eeba6204422790a21c9c5bff9086ef;hb=2ed07e9727517de5f57bc9b3aaf6aaeb8836520c;hp=2103a8f46634b2a46844625e93a89133f9f04366;hpb=b53d4e59bf0a980aa774dcccc27123986e77b8ff;p=lttng-tools.git

diff --git a/tests/unit/test_session.c b/tests/unit/test_session.c
index 2103a8f46..675f710ae 100644
--- a/tests/unit/test_session.c
+++ b/tests/unit/test_session.c
@@ -6,7 +6,6 @@
  */
 
 #include <assert.h>
-#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -17,6 +16,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 +35,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"
@@ -335,7 +330,7 @@ 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_thread_put(ht_cleanup_thread);