X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Funit%2Ftest_session.c;h=4fc23791e0737f46b45878aa17e8471f2b0d80df;hb=81663f073dbfb4b61c06a0ceb8ca33c4fc41b1c5;hp=4e659d5242b6af9f1fdf5ee91ac5e711159d33e7;hpb=c109c263a5bf6c52d3a1cf27e26a784fb28fac07;p=lttng-tools.git

diff --git a/tests/unit/test_session.c b/tests/unit/test_session.c
index 4e659d524..4fc23791e 100644
--- a/tests/unit/test_session.c
+++ b/tests/unit/test_session.c
@@ -1,23 +1,10 @@
 /*
- * Copyright (c)  2011 David Goulet <david.goulet@polymtl.ca>
+ * Copyright (C) 2011 David Goulet <david.goulet@polymtl.ca>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * as published by the Free Software Foundation; only version 2
- * of the License.
+ * SPDX-License-Identifier: GPL-2.0-only
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include <assert.h>
-#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -28,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>
@@ -44,17 +32,8 @@
 /* Number of TAP tests in this file */
 #define NUM_TESTS 11
 
-struct health_app *health_sessiond;
 static struct ltt_session_list *session_list;
 
-/* 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;
-
 static const char alphanum[] =
 	"0123456789"
 	"ABCDEFGHIJKLMNOPQRSTUVWXYZ"
@@ -81,7 +60,7 @@ static char *get_random_string(void)
 /*
  * Return 0 if session name is found, else -1
  */
-static int find_session_name(char *name)
+static int find_session_name(const char *name)
 {
 	struct ltt_session *iter;
 
@@ -119,13 +98,13 @@ static void empty_session_list(void)
 	session_unlock_list();
 
 	/* Session list must be 0 */
-	assert(!session_list_count());
+	LTTNG_ASSERT(!session_list_count());
 }
 
 /*
  * Test creation of 1 session
  */
-static int create_one_session(char *name)
+static int create_one_session(const char *name)
 {
 	int ret;
 	enum lttng_error_code ret_code;
@@ -329,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);
@@ -350,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");