X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Funit%2Ftest_fd_tracker.c;h=0de1729e6b6808e690c406db42e6d247f0790324;hp=42941786e38ed569121d0ab2e06ab84c29b40695;hb=3ea695b469739ac0f1d6e2a6755c79fa11bc0b28;hpb=9d16b343fb9e781fc8d8fa3c448a3f382306dd33

diff --git a/tests/unit/test_fd_tracker.c b/tests/unit/test_fd_tracker.c
index 42941786e..0de1729e6 100644
--- a/tests/unit/test_fd_tracker.c
+++ b/tests/unit/test_fd_tracker.c
@@ -76,6 +76,7 @@ void get_temporary_directories(char **_test_directory, char **_unlink_directory)
 	}
 }
 
+static
 int fd_count(void)
 {
 	DIR *dir;
@@ -187,7 +188,7 @@ void test_unsuspendable_basic(void)
 	ok(tracker, "Created an fd tracker with a limit of %d simulateously opened file descriptors",
 			TRACKER_FD_LIMIT);
 	if (!tracker) {
-		return;
+		goto end;
 	}
 
 	track_std_fds(tracker);
@@ -196,6 +197,7 @@ void test_unsuspendable_basic(void)
 	fd_tracker_destroy(tracker);
 	ret = rmdir(test_directory);
 	ok(ret == 0, "Test directory is empty");
+end:
 	free(test_directory);
 	free(unlinked_files_directory);
 }
@@ -379,7 +381,7 @@ void test_unsuspendable_close_untracked(void)
 
         tracker = fd_tracker_create(unlinked_files_directory, TRACKER_FD_LIMIT);
 	if (!tracker) {
-		return;
+		goto end;;
 	}
 
 	ret = pipe(unknown_fds);
@@ -402,6 +404,7 @@ void test_unsuspendable_close_untracked(void)
 	fd_tracker_destroy(tracker);
 	ret = rmdir(test_directory);
 	ok(ret == 0, "Test directory is empty");
+end:
 	free(test_directory);
 	free(unlinked_files_directory);
 }
@@ -506,7 +509,7 @@ void test_suspendable_limit(void)
 
         tracker = fd_tracker_create(unlinked_files_directory, TRACKER_FD_LIMIT);
 	if (!tracker) {
-		return;
+		goto end;
 	}
 
 	dir_handle = lttng_directory_handle_create(test_directory);
@@ -527,6 +530,7 @@ void test_suspendable_limit(void)
 	ok(ret == 0, "Test directory is empty");
 	fd_tracker_destroy(tracker);
 	lttng_directory_handle_put(dir_handle);
+end:
 	free(test_directory);
 	free(unlinked_files_directory);
 }
@@ -550,7 +554,7 @@ void test_mixed_limit(void)
 
 	tracker = fd_tracker_create(unlinked_files_directory, TRACKER_FD_LIMIT);
 	if (!tracker) {
-		return;
+		goto end;
 	}
 
 	dir_handle = lttng_directory_handle_create(test_directory);
@@ -586,6 +590,7 @@ void test_mixed_limit(void)
 	ok(ret == 0, "Test directory is empty");
 	fd_tracker_destroy(tracker);
 	lttng_directory_handle_put(dir_handle);
+end:
 	free(test_directory);
 	free(unlinked_files_directory);
 }
@@ -622,7 +627,7 @@ void test_suspendable_restore(void)
 
         tracker = fd_tracker_create(unlinked_files_directory, TRACKER_FD_LIMIT);
 	if (!tracker) {
-		return;
+		goto end;
 	}
 
 	dir_handle = lttng_directory_handle_create(test_directory);
@@ -729,6 +734,7 @@ skip_write:
 	ok(ret == 0, "Test directory is empty");
 	fd_tracker_destroy(tracker);
 	lttng_directory_handle_put(dir_handle);
+end:
 	free(test_directory);
 	free(unlinked_files_directory);
 }
@@ -758,7 +764,7 @@ void test_unlink(void)
 
 	tracker = fd_tracker_create(unlinked_files_directory, 1);
 	if (!tracker) {
-		return;
+		goto end;
 	}
 
 	dir_handle = lttng_directory_handle_create(test_directory);
@@ -770,7 +776,7 @@ void test_unlink(void)
 	ok(!ret, "Successfully opened %i handles to %s/%s", handles_to_open,
 			test_directory, file_name);
 	if (ret) {
-		return;
+		goto end;
 	}
 
 	/*
@@ -859,6 +865,7 @@ void test_unlink(void)
 
 	ret = rmdir(test_directory);
 	ok(ret == 0, "Test directory is empty");
+end:
 	fd_tracker_destroy(tracker);
 	free(test_directory);
 	free(unlinked_files_directory);