projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: tests: fix unused-but-set warning in test_fd_tracker.c
[lttng-tools.git]
/
tests
/
unit
/
test_fd_tracker.c
diff --git
a/tests/unit/test_fd_tracker.c
b/tests/unit/test_fd_tracker.c
index 0de1729e6b6808e690c406db42e6d247f0790324..de10f4fa5c2bad41f8723b3260b7c6259465b173 100644
(file)
--- 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.";
"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;
void get_temporary_directories(char **_test_directory, char **_unlink_directory)
{
int ret;
@@
-159,7
+160,6
@@
void untrack_std_fds(struct fd_tracker *tracker)
{ .fd = fileno(stdout), .name = "stdout" },
{ .fd = fileno(stderr), .name = "stderr" },
};
{ .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;
for (i = 0; i < sizeof(files) / sizeof(*files); i++) {
int fd = files[i].fd;
@@
-168,7
+168,6
@@
void untrack_std_fds(struct fd_tracker *tracker)
ok(ret == 0, "Untrack unsuspendable fd %d (%s)", fd,
files[i].name);
ok(ret == 0, "Untrack unsuspendable fd %d (%s)", fd,
files[i].name);
- fds_set_to_minus_1 += (files[i].fd == -1);
}
}
}
}
@@
-328,7
+327,7
@@
int close_pipes(void *data, int *fds)
/*
* Validate that the tracker enforces the open file descriptor limit
/*
* Validate that the tracker enforces the open file descriptor limit
- * when unsuspendable file descri
t
ptors are being opened.
+ * when unsuspendable file descriptors are being opened.
*/
static
void test_unsuspendable_limit(void)
*/
static
void test_unsuspendable_limit(void)
@@
-348,7
+347,7
@@
void test_unsuspendable_limit(void)
ret = fd_tracker_open_unsuspendable_fd(tracker, fds,
NULL, TRACKER_FD_LIMIT, open_pipes, NULL);
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 descri
t
ptors (%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,
TRACKER_FD_LIMIT);
ret = fd_tracker_open_unsuspendable_fd(tracker, &out_fd,
@@
-386,8
+385,10
@@
void test_unsuspendable_close_untracked(void)
ret = pipe(unknown_fds);
assert(!ret);
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);
ret = fd_tracker_open_unsuspendable_fd(tracker, &out_fd,
NULL, 1, noop_open, &stdout_fd);
@@
-892,15
+893,15
@@
int main(int argc, char **argv)
test_unsuspendable_duplicate();
diag("Unsuspendable - closing an untracked file descriptor");
test_unsuspendable_close_untracked();
test_unsuspendable_duplicate();
diag("Unsuspendable - closing an untracked file descriptor");
test_unsuspendable_close_untracked();
- diag("Unsuspendable - check that file descri
t
ptor limit is enforced");
+ diag("Unsuspendable - check that file descriptor limit is enforced");
test_unsuspendable_limit();
test_unsuspendable_limit();
- diag("Suspendable - check that file descri
t
ptor limit is enforced");
+ diag("Suspendable - check that file descriptor limit is enforced");
test_suspendable_limit();
diag("Suspendable - restoration test");
test_suspendable_restore();
test_suspendable_limit();
diag("Suspendable - restoration test");
test_suspendable_restore();
- diag("Mixed - check that file descri
t
ptor limit is enforced");
+ diag("Mixed - check that file descriptor limit is enforced");
test_mixed_limit();
diag("Suspendable - Unlinking test");
test_mixed_limit();
diag("Suspendable - Unlinking test");
This page took
0.026367 seconds
and
4
git commands to generate.