From a3f44329a5eb7fde4ed3e9814f26a77b96fa70a2 Mon Sep 17 00:00:00 2001 From: "Dmitry V. Levin" Date: Wed, 14 Dec 2016 01:02:03 +0000 Subject: [PATCH] tests: fix threads-execve.test for large pids * tests/threads-execve.c (main): Fix expected output for large pids. --- NEWS | 2 +- tests/threads-execve.c | 15 ++++++++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/NEWS b/NEWS index e36717aa..19c73ed3 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,4 @@ -Noteworthy changes in release 4.15 (2016-12-13) +Noteworthy changes in release 4.15 (2016-12-14) * Changes in behavior * Time stamps are now printed according to ISO 8601. diff --git a/tests/threads-execve.c b/tests/threads-execve.c index f8f27868..853645ff 100644 --- a/tests/threads-execve.c +++ b/tests/threads-execve.c @@ -216,22 +216,27 @@ main(int ac, char **av) sigset_t mask; sigemptyset(&mask); + static char leader_str[sizeof(leader) * 3]; + int leader_str_len = + snprintf(leader_str, sizeof(leader_str), "%-5d", leader); + switch (action % NUMBER_OF_ACTIONS) { case ACTION_exit: - printf("%-5d exit(42) = ?\n", leader); + printf("%s exit(42)%*s= ?\n", leader_str, + (int) sizeof(leader_str) - leader_str_len, " "); close(fds[1]); (void) syscall(__NR_exit, 42); break; case ACTION_rt_sigsuspend: - printf("%-5d rt_sigsuspend([], %u \n", - leader, sigsetsize); + printf("%s rt_sigsuspend([], %u \n", + leader_str, sigsetsize); close(fds[1]); (void) k_sigsuspend(&mask); break; case ACTION_nanosleep: - printf("%-5d nanosleep({tv_sec=%u, tv_nsec=0}" + printf("%s nanosleep({tv_sec=%u, tv_nsec=0}" ", \n", - leader, (unsigned int) ts.tv_sec); + leader_str, (unsigned int) ts.tv_sec); close(fds[1]); (void) nanosleep(&ts, 0); break; -- 2.40.0