Commit f76f9bc6 authored by John Hubbard's avatar John Hubbard Committed by Shuah Khan

selftest/timerns: fix clang build failures for abs() calls

When building with clang, via:

    make LLVM=1 -C tools/testing/selftests

...clang warns about mismatches between the expected and required
integer length being supplied to abs(3).

Fix this by using the correct variant of abs(3): labs(3) or llabs(3), in
these cases.
Reviewed-by: default avatarDmitry Safonov <dima@arista.com>
Reviewed-by: default avatarMuhammad Usama Anjum <usama.anjum@collabora.com>
Signed-off-by: default avatarJohn Hubbard <jhubbard@nvidia.com>
Acked-by: default avatarAndrei Vagin <avagin@google.com>
Signed-off-by: default avatarShuah Khan <skhan@linuxfoundation.org>
parent 48236960
...@@ -30,7 +30,7 @@ int main(int argc, char *argv[]) ...@@ -30,7 +30,7 @@ int main(int argc, char *argv[])
for (i = 0; i < 2; i++) { for (i = 0; i < 2; i++) {
_gettime(CLOCK_MONOTONIC, &tst, i); _gettime(CLOCK_MONOTONIC, &tst, i);
if (abs(tst.tv_sec - now.tv_sec) > 5) if (labs(tst.tv_sec - now.tv_sec) > 5)
return pr_fail("%ld %ld\n", now.tv_sec, tst.tv_sec); return pr_fail("%ld %ld\n", now.tv_sec, tst.tv_sec);
} }
return 0; return 0;
...@@ -50,7 +50,7 @@ int main(int argc, char *argv[]) ...@@ -50,7 +50,7 @@ int main(int argc, char *argv[])
for (i = 0; i < 2; i++) { for (i = 0; i < 2; i++) {
_gettime(CLOCK_MONOTONIC, &tst, i); _gettime(CLOCK_MONOTONIC, &tst, i);
if (abs(tst.tv_sec - now.tv_sec) > 5) if (labs(tst.tv_sec - now.tv_sec) > 5)
return pr_fail("%ld %ld\n", return pr_fail("%ld %ld\n",
now.tv_sec, tst.tv_sec); now.tv_sec, tst.tv_sec);
} }
...@@ -70,7 +70,7 @@ int main(int argc, char *argv[]) ...@@ -70,7 +70,7 @@ int main(int argc, char *argv[])
/* Check that a child process is in the new timens. */ /* Check that a child process is in the new timens. */
for (i = 0; i < 2; i++) { for (i = 0; i < 2; i++) {
_gettime(CLOCK_MONOTONIC, &tst, i); _gettime(CLOCK_MONOTONIC, &tst, i);
if (abs(tst.tv_sec - now.tv_sec - OFFSET) > 5) if (labs(tst.tv_sec - now.tv_sec - OFFSET) > 5)
return pr_fail("%ld %ld\n", return pr_fail("%ld %ld\n",
now.tv_sec + OFFSET, tst.tv_sec); now.tv_sec + OFFSET, tst.tv_sec);
} }
......
...@@ -56,7 +56,7 @@ int run_test(int clockid, struct timespec now) ...@@ -56,7 +56,7 @@ int run_test(int clockid, struct timespec now)
return pr_perror("timerfd_gettime"); return pr_perror("timerfd_gettime");
elapsed = new_value.it_value.tv_sec; elapsed = new_value.it_value.tv_sec;
if (abs(elapsed - 3600) > 60) { if (llabs(elapsed - 3600) > 60) {
ksft_test_result_fail("clockid: %d elapsed: %lld\n", ksft_test_result_fail("clockid: %d elapsed: %lld\n",
clockid, elapsed); clockid, elapsed);
return 1; return 1;
......
...@@ -61,7 +61,7 @@ int run_test(int clockid, struct timespec now) ...@@ -61,7 +61,7 @@ int run_test(int clockid, struct timespec now)
return pr_perror("timerfd_gettime(%d)", clockid); return pr_perror("timerfd_gettime(%d)", clockid);
elapsed = new_value.it_value.tv_sec; elapsed = new_value.it_value.tv_sec;
if (abs(elapsed - 3600) > 60) { if (llabs(elapsed - 3600) > 60) {
ksft_test_result_fail("clockid: %d elapsed: %lld\n", ksft_test_result_fail("clockid: %d elapsed: %lld\n",
clockid, elapsed); clockid, elapsed);
return 1; return 1;
......
...@@ -32,7 +32,7 @@ static void *tcheck(void *_args) ...@@ -32,7 +32,7 @@ static void *tcheck(void *_args)
for (i = 0; i < 2; i++) { for (i = 0; i < 2; i++) {
_gettime(CLOCK_MONOTONIC, &tst, i); _gettime(CLOCK_MONOTONIC, &tst, i);
if (abs(tst.tv_sec - now->tv_sec) > 5) { if (labs(tst.tv_sec - now->tv_sec) > 5) {
pr_fail("%s: in-thread: unexpected value: %ld (%ld)\n", pr_fail("%s: in-thread: unexpected value: %ld (%ld)\n",
args->tst_name, tst.tv_sec, now->tv_sec); args->tst_name, tst.tv_sec, now->tv_sec);
return (void *)1UL; return (void *)1UL;
...@@ -64,7 +64,7 @@ static int check(char *tst_name, struct timespec *now) ...@@ -64,7 +64,7 @@ static int check(char *tst_name, struct timespec *now)
for (i = 0; i < 2; i++) { for (i = 0; i < 2; i++) {
_gettime(CLOCK_MONOTONIC, &tst, i); _gettime(CLOCK_MONOTONIC, &tst, i);
if (abs(tst.tv_sec - now->tv_sec) > 5) if (labs(tst.tv_sec - now->tv_sec) > 5)
return pr_fail("%s: unexpected value: %ld (%ld)\n", return pr_fail("%s: unexpected value: %ld (%ld)\n",
tst_name, tst.tv_sec, now->tv_sec); tst_name, tst.tv_sec, now->tv_sec);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment