Skip to content

Commit 1e220bd

Browse files
tpambortpambor
committed
tests: posix: fix -Wformat errors
Use %lld format specifier for variables of type eventfd_t. Cast variables of type time_t to long long and use %lld format specifier to ensure compatibility with 32-bit and 64-bit time_t. Signed-off-by: Tim Pambor <[email protected]>
1 parent 2d72d86 commit 1e220bd

File tree

6 files changed

+23
-23
lines changed

6 files changed

+23
-23
lines changed

‎tests/posix/common/src/pthread_attr.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -527,9 +527,9 @@ ZTEST(pthread_attr, test_pthread_attr_policy_and_priority_limits)
527527
*
528528
* Note: we relax this requirement
529529
*/
530-
zassert_true(pmax > pmin, "pmax (%d) <= pmin (%d)", pmax, pmin,
531-
"%s min/max inconsistency: pmin: %d pmax: %d",
532-
policy_names[policy], pmin, pmax);
530+
zassert_true(pmax > pmin,
531+
"%s min/max inconsistency, pmax (%d) <= pmin (%d)",
532+
policy_names[policy], pmax, pmin);
533533

534534
/*
535535
* Getting into the weeds a bit (i.e. whitebox testing), Zephyr

‎tests/posix/eventfd/src/blocking.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ ZTEST_F(eventfd, test_write_then_read)
1919

2020
ret = eventfd_read(fixture->fd, &val);
2121
zassert_true(ret == 0, "read ret %d", ret);
22-
zassert_true(val == 5, "val == %d", val);
22+
zassert_true(val == 5, "val == %lld", val);
2323

2424
/* Test EFD_SEMAPHORE */
2525
reopen(&fixture->fd, 0, EFD_SEMAPHORE);
@@ -32,7 +32,7 @@ ZTEST_F(eventfd, test_write_then_read)
3232

3333
ret = eventfd_read(fixture->fd, &val);
3434
zassert_true(ret == 0, "read ret %d", ret);
35-
zassert_true(val == 1, "val == %d", val);
35+
zassert_true(val == 1, "val == %lld", val);
3636
}
3737

3838
ZTEST_F(eventfd, test_zero_shall_not_unblock)

‎tests/posix/eventfd/src/ioctl.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ ZTEST_F(eventfd, test_set_flags)
3232

3333
ret = eventfd_read(fixture->fd, &val);
3434
zassert_ok(ret);
35-
zassert_equal(val, 3, "val == %d", val);
35+
zassert_equal(val, 3, "val == %lld", val);
3636

3737

3838
/* Set nonblocking without reopening. */
@@ -53,7 +53,7 @@ ZTEST_F(eventfd, test_set_flags)
5353

5454
ret = eventfd_read(fixture->fd, &val);
5555
zassert_ok(ret);
56-
zassert_equal(val, 19, "val == %d", val);
56+
zassert_equal(val, 19, "val == %lld", val);
5757

5858

5959
/* Set back to blocking. */
@@ -74,7 +74,7 @@ ZTEST_F(eventfd, test_set_flags)
7474

7575
ret = eventfd_read(fixture->fd, &val);
7676
zassert_ok(ret);
77-
zassert_equal(val, 10, "val == %d", val);
77+
zassert_equal(val, 10, "val == %lld", val);
7878

7979

8080
/* Test setting internal in-use-flag. Should fail. */
@@ -88,5 +88,5 @@ ZTEST_F(eventfd, test_set_flags)
8888

8989
ret = eventfd_read(fixture->fd, &val);
9090
zassert_ok(ret);
91-
zassert_equal(val, 97, "val == %d", val);
91+
zassert_equal(val, 97, "val == %lld", val);
9292
}

‎tests/posix/eventfd/src/nonblocking.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ ZTEST_F(eventfd, test_read_nonblock)
2222

2323
ret = eventfd_read(fixture->fd, &val);
2424
zassert_true(ret == 0, "read set ret %d", ret);
25-
zassert_true(val == TESTVAL, "red set val %d", val);
25+
zassert_true(val == TESTVAL, "red set val %lld", val);
2626

2727
ret = eventfd_read(fixture->fd, &val);
28-
zassert_true(ret == -1, "read subsequent ret %d val %d", ret, val);
28+
zassert_true(ret == -1, "read subsequent ret %d val %lld", ret, val);
2929
zassert_true(errno == EAGAIN, "errno %d", errno);
3030
}
3131

‎tests/posix/signals/src/main.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ ZTEST(posix_signals, test_sigaddset)
7373
for (int i = 0; i < SIGSET_NLONGS; i++) {
7474
zassert_equal(_set[i], _target[i],
7575
"set.sig[%d of %d] has content: %lx, expected %lx", i,
76-
SIGSET_NLONGS - 1, _set[i], _target[i]);
76+
(int)(SIGSET_NLONGS - 1), _set[i], _target[i]);
7777
}
7878

7979
signo = SIGSYS;
@@ -82,7 +82,7 @@ ZTEST(posix_signals, test_sigaddset)
8282
for (int i = 0; i < SIGSET_NLONGS; i++) {
8383
zassert_equal(_set[i], _target[i],
8484
"set.sig[%d of %d] has content: %lx, expected %lx", i,
85-
SIGSET_NLONGS - 1, _set[i], _target[i]);
85+
(int)(SIGSET_NLONGS - 1), _set[i], _target[i]);
8686
}
8787

8888
signo = SIGRTMIN; /* >=32, will be in the second sig set for 32bit */
@@ -95,7 +95,7 @@ ZTEST(posix_signals, test_sigaddset)
9595
for (int i = 0; i < SIGSET_NLONGS; i++) {
9696
zassert_equal(_set[i], _target[i],
9797
"set.sig[%d of %d] has content: %lx, expected %lx", i,
98-
SIGSET_NLONGS - 1, _set[i], _target[i]);
98+
(int)(SIGSET_NLONGS - 1), _set[i], _target[i]);
9999
}
100100

101101
if (SIGRTMAX >= SIGSET_NLONGS * BITS_PER_LONG) {
@@ -109,7 +109,7 @@ ZTEST(posix_signals, test_sigaddset)
109109
for (int i = 0; i < SIGSET_NLONGS; i++) {
110110
zassert_equal(_set[i], _target[i],
111111
"set.sig[%d of %d] has content: %lx, expected %lx", i,
112-
SIGSET_NLONGS - 1, _set[i], _target[i]);
112+
(int)(SIGSET_NLONGS - 1), _set[i], _target[i]);
113113
}
114114
}
115115

@@ -141,7 +141,7 @@ ZTEST(posix_signals, test_sigdelset)
141141
for (int i = 0; i < SIGSET_NLONGS; i++) {
142142
zassert_equal(_set[i], _target[i],
143143
"set.sig[%d of %d] has content: %lx, expected %lx", i,
144-
SIGSET_NLONGS - 1, _set[i], _target[i]);
144+
(int)(SIGSET_NLONGS - 1), _set[i], _target[i]);
145145
}
146146

147147
signo = SIGSYS;
@@ -150,7 +150,7 @@ ZTEST(posix_signals, test_sigdelset)
150150
for (int i = 0; i < SIGSET_NLONGS; i++) {
151151
zassert_equal(_set[i], _target[i],
152152
"set.sig[%d of %d] has content: %lx, expected %lx", i,
153-
SIGSET_NLONGS - 1, _set[i], _target[i]);
153+
(int)(SIGSET_NLONGS - 1), _set[i], _target[i]);
154154
}
155155

156156
signo = SIGRTMIN; /* >=32, will be in the second sig set for 32bit */
@@ -163,7 +163,7 @@ ZTEST(posix_signals, test_sigdelset)
163163
for (int i = 0; i < SIGSET_NLONGS; i++) {
164164
zassert_equal(_set[i], _target[i],
165165
"set.sig[%d of %d] has content: %lx, expected %lx", i,
166-
SIGSET_NLONGS - 1, _set[i], _target[i]);
166+
(int)(SIGSET_NLONGS - 1), _set[i], _target[i]);
167167
}
168168

169169
if (SIGRTMAX >= SIGSET_NLONGS * BITS_PER_LONG) {
@@ -182,7 +182,7 @@ ZTEST(posix_signals, test_sigdelset)
182182
for (int i = 0; i < SIGSET_NLONGS; i++) {
183183
zassert_equal(_set[i], _target[i],
184184
"set.sig[%d of %d] has content: %lx, expected %lx", i,
185-
SIGSET_NLONGS - 1, _set[i], _target[i]);
185+
(int)(SIGSET_NLONGS - 1), _set[i], _target[i]);
186186
}
187187
}
188188

‎tests/posix/timers/src/nanosleep_common.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,10 @@ void common_lower_bound_check(int selection, clockid_t clock_id, int flags, cons
6666

6767
zassert_equal(r, 0, "actual: %d expected: %d", r, 0);
6868
zassert_equal(errno, 0, "actual: %d expected: %d", errno, 0);
69-
zassert_equal(req.tv_sec, s, "actual: %d expected: %d", req.tv_sec, s);
70-
zassert_equal(req.tv_nsec, ns, "actual: %d expected: %d", req.tv_nsec, ns);
71-
zassert_equal(rem.tv_sec, 0, "actual: %d expected: %d", rem.tv_sec, 0);
72-
zassert_equal(rem.tv_nsec, 0, "actual: %d expected: %d", rem.tv_nsec, 0);
69+
zassert_equal(req.tv_sec, s, "actual: %lld expected: %d", (long long)req.tv_sec, s);
70+
zassert_equal(req.tv_nsec, ns, "actual: %lld expected: %d", (long long)req.tv_nsec, ns);
71+
zassert_equal(rem.tv_sec, 0, "actual: %lld expected: %d", (long long)rem.tv_sec, 0);
72+
zassert_equal(rem.tv_nsec, 0, "actual: %lld expected: %d", (long long)rem.tv_nsec, 0);
7373

7474
switch (selection) {
7575
case SELECT_NANOSLEEP:

0 commit comments

Comments
 (0)