X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Funit%2Ftest_session.cpp;h=05c1f81b687fdabe6698cfb715927defca9aef90;hb=c9e313bc594f40a86eed237dce222c0fc99c957f;hp=4fc23791e0737f46b45878aa17e8471f2b0d80df;hpb=7966af5763c4aaca39df9bbfa9277ff15715c720;p=lttng-tools.git

diff --git a/tests/unit/test_session.cpp b/tests/unit/test_session.cpp
index 4fc23791e..05c1f81b6 100644
--- a/tests/unit/test_session.cpp
+++ b/tests/unit/test_session.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011 David Goulet <david.goulet@polymtl.ca>
+ * Copyright (C) 2011 EfficiOS Inc.
  *
  * SPDX-License-Identifier: GPL-2.0-only
  *
@@ -8,21 +8,20 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
-#include <time.h>
 #include <sys/types.h>
+#include <time.h>
+#include <unistd.h>
 #include <urcu.h>
 
 #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>
-#include <bin/lttng-sessiond/health-sessiond.h>
-#include <bin/lttng-sessiond/thread.h>
-#include <common/sessiond-comm/sessiond-comm.h>
-#include <common/common.h>
+#include <bin/lttng-sessiond/health-sessiond.hpp>
+#include <bin/lttng-sessiond/session.hpp>
+#include <bin/lttng-sessiond/thread.hpp>
+#include <bin/lttng-sessiond/ust-app.hpp>
+#include <common/common.hpp>
+#include <common/compat/errno.hpp>
+#include <common/sessiond-comm/sessiond-comm.hpp>
 
 #define SESSION1 "test1"
 
@@ -323,16 +322,12 @@ static void test_large_session_number(void)
 	   MAX_SESSIONS);
 }
 
-int main(int argc, char **argv)
+int main(void)
 {
-	struct lttng_thread *ht_cleanup_thread;
 
 	plan_tests(NUM_TESTS);
 
 	the_health_sessiond = health_app_create(NR_HEALTH_SESSIOND_TYPES);
-	ht_cleanup_thread = launch_ht_cleanup_thread();
-	LTTNG_ASSERT(ht_cleanup_thread);
-	lttng_thread_put(ht_cleanup_thread);
 
 	diag("Sessions unit tests");