X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Funit%2Ftest_fd_tracker.c;h=7c818b94bd2fb6cee2749016f89fc902f4278cce;hb=d2cb4a903e7b0868be99c6d558ce0c782af81c27;hp=42941786e38ed569121d0ab2e06ab84c29b40695;hpb=9d16b343fb9e781fc8d8fa3c448a3f382306dd33;p=lttng-tools.git

diff --git a/tests/unit/test_fd_tracker.c b/tests/unit/test_fd_tracker.c
index 42941786e..7c818b94b 100644
--- a/tests/unit/test_fd_tracker.c
+++ b/tests/unit/test_fd_tracker.c
@@ -54,6 +54,7 @@ const char file_contents[] = "Bacon ipsum dolor amet jerky drumstick sirloin "
 	"Landjaeger tri-tip salami leberkas ball tip, ham hock chuck sausage "
 	"flank jerky cupim. Pig bacon chuck pancetta andouille.";
 
+static
 void get_temporary_directories(char **_test_directory, char **_unlink_directory)
 {
 	int ret;
@@ -76,6 +77,7 @@ void get_temporary_directories(char **_test_directory, char **_unlink_directory)
 	}
 }
 
+static
 int fd_count(void)
 {
 	DIR *dir;
@@ -187,7 +189,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 +198,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);
 }
@@ -326,7 +329,7 @@ int close_pipes(void *data, int *fds)
 
 /*
  * Validate that the tracker enforces the open file descriptor limit
- * when unsuspendable file descritptors are being opened.
+ * when unsuspendable file descriptors are being opened.
  */
 static
 void test_unsuspendable_limit(void)
@@ -346,7 +349,7 @@ void test_unsuspendable_limit(void)
 
 	ret = fd_tracker_open_unsuspendable_fd(tracker, fds,
 			NULL, TRACKER_FD_LIMIT, open_pipes, NULL);
-	ok(ret == 0, "File descriptor tracker allowed the user to meet its limit with unsuspendable file descritptors (%d)",
+	ok(ret == 0, "File descriptor tracker allowed the user to meet its limit with unsuspendable file descriptors (%d)",
 			TRACKER_FD_LIMIT);
 
 	ret = fd_tracker_open_unsuspendable_fd(tracker, &out_fd,
@@ -379,7 +382,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 +405,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 +510,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 +531,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 +555,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 +591,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 +628,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 +735,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 +765,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 +777,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 +866,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);
@@ -885,15 +893,15 @@ int main(int argc, char **argv)
 	test_unsuspendable_duplicate();
 	diag("Unsuspendable - closing an untracked file descriptor");
 	test_unsuspendable_close_untracked();
-	diag("Unsuspendable - check that file descritptor limit is enforced");
+	diag("Unsuspendable - check that file descriptor limit is enforced");
 	test_unsuspendable_limit();
 
-	diag("Suspendable - check that file descritptor limit is enforced");
+	diag("Suspendable - check that file descriptor limit is enforced");
 	test_suspendable_limit();
 	diag("Suspendable - restoration test");
 	test_suspendable_restore();
 
-	diag("Mixed - check that file descritptor limit is enforced");
+	diag("Mixed - check that file descriptor limit is enforced");
 	test_mixed_limit();
 
 	diag("Suspendable - Unlinking test");