X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=tests%2Funit%2Ftest_fd_tracker.c;h=b185a95b1945d399e179d2a7adaf813cf424e0e0;hb=364369ca9a41e7e67de24f460f12c49cea450ed4;hp=db9b4248b4b137d239d58872b0bfa9a86e46aa2f;hpb=58cd719683b1cbc3a5467a1ac258cc6194bc1790;p=lttng-tools.git

diff --git a/tests/unit/test_fd_tracker.c b/tests/unit/test_fd_tracker.c
index db9b4248b..b185a95b1 100644
--- a/tests/unit/test_fd_tracker.c
+++ b/tests/unit/test_fd_tracker.c
@@ -15,7 +15,6 @@
 #include <sys/types.h>
 #include <dirent.h>
 #include <stdio.h>
-#include <errno.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/stat.h>
@@ -24,6 +23,7 @@
 #include <urcu.h>
 
 #include <common/compat/directory-handle.h>
+#include <common/compat/errno.h>
 #include <common/error.h>
 #include <common/fd-tracker/fd-tracker.h>
 
@@ -40,6 +40,13 @@ int lttng_opt_mi;
 #define TMP_DIR_PATTERN "/tmp/fd-tracker-XXXXXX"
 #define TEST_UNLINK_DIRECTORY_NAME "unlinked_files"
 
+#ifdef __linux__
+#define SELF_FD_DIR "/proc/self/fd"
+#else
+/* Most Unices have /dev/fd */
+#define SELF_FD_DIR "/dev/fd"
+#endif
+
 /*
  * Count of fds, beyond stdin, stderr, stdout that were open
  * at the launch of the test. This allows the test to succeed when
@@ -84,9 +91,9 @@ int fd_count(void)
 	struct dirent *entry;
 	int count = 0;
 
-	dir = opendir("/proc/self/fd");
+	dir = opendir(SELF_FD_DIR);
 	if (!dir) {
-		perror("# Failed to enumerate /proc/self/fd/ to count the number of used file descriptors");
+		perror("# Failed to enumerate " SELF_FD_DIR " to count the number of used file descriptors");
 		count = -1;
 		goto end;
 	}
@@ -100,7 +107,7 @@ int fd_count(void)
 	/* Don't account for the file descriptor opened by opendir(). */
 	count--;
 	if (closedir(dir)) {
-		perror("# Failed to close test program's self/fd directory file descriptor");
+		perror("# Failed to close test program's " SELF_FD_DIR " directory file descriptor");
 	}
 end:
 	return count;
@@ -160,7 +167,6 @@ void untrack_std_fds(struct fd_tracker *tracker)
 		{ .fd = fileno(stdout), .name = "stdout" },
 		{ .fd = fileno(stderr), .name = "stderr" },
 	};
-	unsigned int fds_set_to_minus_1 = 0;
 
 	for (i = 0; i < sizeof(files) / sizeof(*files); i++) {
 		int fd = files[i].fd;
@@ -169,7 +175,6 @@ void untrack_std_fds(struct fd_tracker *tracker)
 
 		ok(ret == 0, "Untrack unsuspendable fd %d (%s)", fd,
 				files[i].name);
-		fds_set_to_minus_1 += (files[i].fd == -1);
 	}
 }
 
@@ -387,8 +392,10 @@ void test_unsuspendable_close_untracked(void)
 
 	ret = pipe(unknown_fds);
 	assert(!ret);
-	assert(close(unknown_fds[0]) == 0);
-	assert(close(unknown_fds[1]) == 0);
+	ret = close(unknown_fds[0]);
+	assert(ret == 0);
+	ret = close(unknown_fds[1]);
+	assert(ret == 0);
 
 	ret = fd_tracker_open_unsuspendable_fd(tracker, &out_fd,
 			NULL, 1, noop_open, &stdout_fd);