3 files changed, 37 insertions, 27 deletions

diff --git a/tools/testing/selftests/mqueue/Makefile b/tools/testing/selftests/mqueue/Makefile
index 218a122c7951..8056e2e68fa4 100644
--- a/tools/testing/selftests/mqueue/Makefile
+++ b/tools/testing/selftests/mqueue/Makefile
@@ -1,6 +1,6 @@
 all:
-        gcc -O2 -lrt mq_open_tests.c -o mq_open_tests
-        gcc -O2 -lrt -lpthread -lpopt -o mq_perf_tests mq_perf_tests.c
+        gcc -O2 mq_open_tests.c -o mq_open_tests -lrt
+        gcc -O2 -o mq_perf_tests mq_perf_tests.c -lrt -lpthread -lpopt
 
 run_tests:
         @./mq_open_tests /test1 || echo "mq_open_tests: [FAIL]"
diff --git a/tools/testing/selftests/mqueue/mq_open_tests.c b/tools/testing/selftests/mqueue/mq_open_tests.c
index 711cc2923047..9c1a5d359055 100644
--- a/tools/testing/selftests/mqueue/mq_open_tests.c
+++ b/tools/testing/selftests/mqueue/mq_open_tests.c
@@ -80,7 +80,8 @@ void shutdown(int exit_val, char *err_cause, int line_no)
         if (in_shutdown++)
                 return;
 
-        seteuid(0);
+        if (seteuid(0) == -1)
+                perror("seteuid() failed");
 
         if (queue != -1)
                 if (mq_close(queue))
@@ -292,8 +293,10 @@ int main(int argc, char *argv[])
         /* Tell the user our initial state */
         printf("\nInitial system state:\n");
         printf("\tUsing queue path:\t\t%s\n", queue_path);
-        printf("\tRLIMIT_MSGQUEUE(soft):\t\t%d\n", saved_limits.rlim_cur);
-        printf("\tRLIMIT_MSGQUEUE(hard):\t\t%d\n", saved_limits.rlim_max);
+        printf("\tRLIMIT_MSGQUEUE(soft):\t\t%ld\n",
+                (long) saved_limits.rlim_cur);
+        printf("\tRLIMIT_MSGQUEUE(hard):\t\t%ld\n",
+                (long) saved_limits.rlim_max);
         printf("\tMaximum Message Size:\t\t%d\n", saved_max_msgsize);
         printf("\tMaximum Queue Size:\t\t%d\n", saved_max_msgs);
         if (default_settings) {
@@ -308,8 +311,8 @@ int main(int argc, char *argv[])
         validate_current_settings();
 
         printf("Adjusted system state for testing:\n");
-        printf("\tRLIMIT_MSGQUEUE(soft):\t\t%d\n", cur_limits.rlim_cur);
-        printf("\tRLIMIT_MSGQUEUE(hard):\t\t%d\n", cur_limits.rlim_max);
+        printf("\tRLIMIT_MSGQUEUE(soft):\t\t%ld\n", (long) cur_limits.rlim_cur);
+        printf("\tRLIMIT_MSGQUEUE(hard):\t\t%ld\n", (long) cur_limits.rlim_max);
         printf("\tMaximum Message Size:\t\t%d\n", cur_max_msgsize);
         printf("\tMaximum Queue Size:\t\t%d\n", cur_max_msgs);
         if (default_settings) {
@@ -454,7 +457,12 @@ int main(int argc, char *argv[])
         else
                 printf("Queue open with total size > 2GB when euid = 0 "
                        "failed:\t\t\tPASS\n");
-        seteuid(99);
+
+        if (seteuid(99) == -1) {
+                perror("seteuid() failed");
+                exit(1);
+        }
+
         attr.mq_maxmsg = cur_max_msgs;
         attr.mq_msgsize = cur_max_msgsize;
         if (test_queue_fail(&attr, &result))
diff --git a/tools/testing/selftests/mqueue/mq_perf_tests.c b/tools/testing/selftests/mqueue/mq_perf_tests.c
index 2fadd4b97045..94dae65eea41 100644
--- a/tools/testing/selftests/mqueue/mq_perf_tests.c
+++ b/tools/testing/selftests/mqueue/mq_perf_tests.c
@@ -296,9 +296,9 @@ static inline void open_queue(struct mq_attr *attr)
         printf("\n\tQueue %s created:\n", queue_path);
         printf("\t\tmq_flags:\t\t\t%s\n", result.mq_flags & O_NONBLOCK ?
                "O_NONBLOCK" : "(null)");
-        printf("\t\tmq_maxmsg:\t\t\t%d\n", result.mq_maxmsg);
-        printf("\t\tmq_msgsize:\t\t\t%d\n", result.mq_msgsize);
-        printf("\t\tmq_curmsgs:\t\t\t%d\n", result.mq_curmsgs);
+        printf("\t\tmq_maxmsg:\t\t\t%lu\n", result.mq_maxmsg);
+        printf("\t\tmq_msgsize:\t\t\t%lu\n", result.mq_msgsize);
+        printf("\t\tmq_curmsgs:\t\t\t%lu\n", result.mq_curmsgs);
 }
 
 void *fake_cont_thread(void *arg)
@@ -440,7 +440,7 @@ void *perf_test_thread(void *arg)
                 shutdown(2, "clock_getres()", __LINE__);
 
         printf("\t\tMax priorities:\t\t\t%d\n", mq_prio_max);
-        printf("\t\tClock resolution:\t\t%d nsec%s\n", res.tv_nsec,
+        printf("\t\tClock resolution:\t\t%lu nsec%s\n", res.tv_nsec,
                res.tv_nsec > 1 ? "s" : "");
 
 
@@ -454,20 +454,20 @@ void *perf_test_thread(void *arg)
         recv_total.tv_nsec = 0;
         for (i = 0; i < TEST1_LOOPS; i++)
                 do_send_recv();
-        printf("\t\tSend msg:\t\t\t%d.%ds total time\n",
+        printf("\t\tSend msg:\t\t\t%ld.%lus total time\n",
                send_total.tv_sec, send_total.tv_nsec);
         nsec = ((unsigned long long)send_total.tv_sec * 1000000000 +
                  send_total.tv_nsec) / TEST1_LOOPS;
-        printf("\t\t\t\t\t\t%d nsec/msg\n", nsec);
-        printf("\t\tRecv msg:\t\t\t%d.%ds total time\n",
+        printf("\t\t\t\t\t\t%lld nsec/msg\n", nsec);
+        printf("\t\tRecv msg:\t\t\t%ld.%lus total time\n",
                recv_total.tv_sec, recv_total.tv_nsec);
         nsec = ((unsigned long long)recv_total.tv_sec * 1000000000 +
                 recv_total.tv_nsec) / TEST1_LOOPS;
-        printf("\t\t\t\t\t\t%d nsec/msg\n", nsec);
+        printf("\t\t\t\t\t\t%lld nsec/msg\n", nsec);
 
 
         for (cur_test = test2; cur_test->desc != NULL; cur_test++) {
-                printf(cur_test->desc);
+                printf("%s:\n", cur_test->desc);
                 printf("\t\t(%d iterations)\n", TEST2_LOOPS);
                 prio_out = 0;
                 send_total.tv_sec = 0;
@@ -493,16 +493,16 @@ void *perf_test_thread(void *arg)
                         cur_test->func(&prio_out);
                 }
                 printf("done.\n");
-                printf("\t\tSend msg:\t\t\t%d.%ds total time\n",
+                printf("\t\tSend msg:\t\t\t%ld.%lus total time\n",
                        send_total.tv_sec, send_total.tv_nsec);
                 nsec = ((unsigned long long)send_total.tv_sec * 1000000000 +
                          send_total.tv_nsec) / TEST2_LOOPS;
-                printf("\t\t\t\t\t\t%d nsec/msg\n", nsec);
-                printf("\t\tRecv msg:\t\t\t%d.%ds total time\n",
+                printf("\t\t\t\t\t\t%lld nsec/msg\n", nsec);
+                printf("\t\tRecv msg:\t\t\t%ld.%lus total time\n",
                        recv_total.tv_sec, recv_total.tv_nsec);
                 nsec = ((unsigned long long)recv_total.tv_sec * 1000000000 +
                         recv_total.tv_nsec) / TEST2_LOOPS;
-                printf("\t\t\t\t\t\t%d nsec/msg\n", nsec);
+                printf("\t\t\t\t\t\t%lld nsec/msg\n", nsec);
                 printf("\t\tDraining queue...");
                 fflush(stdout);
                 clock_gettime(clock, &start);
@@ -653,8 +653,10 @@ int main(int argc, char *argv[])
         /* Tell the user our initial state */
         printf("\nInitial system state:\n");
         printf("\tUsing queue path:\t\t\t%s\n", queue_path);
-        printf("\tRLIMIT_MSGQUEUE(soft):\t\t\t%d\n", saved_limits.rlim_cur);
-        printf("\tRLIMIT_MSGQUEUE(hard):\t\t\t%d\n", saved_limits.rlim_max);
+        printf("\tRLIMIT_MSGQUEUE(soft):\t\t\t%ld\n",
+                (long) saved_limits.rlim_cur);
+        printf("\tRLIMIT_MSGQUEUE(hard):\t\t\t%ld\n",
+                (long) saved_limits.rlim_max);
         printf("\tMaximum Message Size:\t\t\t%d\n", saved_max_msgsize);
         printf("\tMaximum Queue Size:\t\t\t%d\n", saved_max_msgs);
         printf("\tNice value:\t\t\t\t%d\n", cur_nice);
@@ -667,10 +669,10 @@ int main(int argc, char *argv[])
                 printf("\tRLIMIT_MSGQUEUE(soft):\t\t\t(unlimited)\n");
                 printf("\tRLIMIT_MSGQUEUE(hard):\t\t\t(unlimited)\n");
         } else {
-                printf("\tRLIMIT_MSGQUEUE(soft):\t\t\t%d\n",
-                       cur_limits.rlim_cur);
-                printf("\tRLIMIT_MSGQUEUE(hard):\t\t\t%d\n",
-                       cur_limits.rlim_max);
+                printf("\tRLIMIT_MSGQUEUE(soft):\t\t\t%ld\n",
+                       (long) cur_limits.rlim_cur);
+                printf("\tRLIMIT_MSGQUEUE(hard):\t\t\t%ld\n",
+                       (long) cur_limits.rlim_max);
         }
         printf("\tMaximum Message Size:\t\t\t%d\n", cur_max_msgsize);
         printf("\tMaximum Queue Size:\t\t\t%d\n", cur_max_msgs);