rt/tst-mqueue*: Return UNSUPPORTED when mq_open fails with ENOSYS

Rather than returning 0 or a failure.

diff --git a/rt/tst-mqueue1.c b/rt/tst-mqueue1.c
index 1fa807f19a1c7992141c7f14f98d64e3b7fa6735..3aa0369a2b514b59b71c2f308351adc5b74da837 100644 (file)
--- a/rt/tst-mqueue1.c
+++ b/rt/tst-mqueue1.c
@@ -26,6 +26,7 @@
 #include <time.h>
 #include <unistd.h>
 #include <stdint.h>
+#include <support/check.h>
 #include "tst-mqueue.h"
 
 static int
@@ -322,11 +323,14 @@ do_test (void)
 
   if (q == (mqd_t) -1)
     {
+      if (errno == ENOSYS)
+       FAIL_UNSUPPORTED ("mq_open not supported");
+
       printf ("mq_open failed with: %m\n");
-      return result;
+      return 1;
     }
-  else
-    add_temp_mq (name);
+
+  add_temp_mq (name);
 
   result |= do_one_test (q, name, 0);
 

diff --git a/rt/tst-mqueue10.c b/rt/tst-mqueue10.c
index 9da9838258fe122c0ed785f70f55756aa734058e..059c06448844d5fc4d03b610a0e09485eff8c399 100644 (file)
--- a/rt/tst-mqueue10.c
+++ b/rt/tst-mqueue10.c
@@ -43,7 +43,15 @@ do_test (void)
 
   struct mq_attr attr = { .mq_maxmsg = 1, .mq_msgsize = sizeof (msg) };
   mqd_t q = mq_open (name, O_CREAT | O_EXCL | O_RDWR, 0600, &attr);
-  TEST_VERIFY_EXIT (q != (mqd_t) -1);
+
+  if (q == (mqd_t) -1)
+    {
+      if (errno == ENOSYS)
+       FAIL_UNSUPPORTED ("mq_open not supported");
+
+      printf ("mq_open failed with: %m\n");
+      return 1;
+    }
 
   struct timespec ts = { TYPE_MAXIMUM (time_t), 0 };
 

diff --git a/rt/tst-mqueue2.c b/rt/tst-mqueue2.c
index 18fadfe09cd84083e8fc9ea5ea99fd6e7e06183c..b355d22474a5d11535ed1361b47f1f99b8fa47e9 100644 (file)
--- a/rt/tst-mqueue2.c
+++ b/rt/tst-mqueue2.c
@@ -27,6 +27,7 @@
 #include <sys/wait.h>
 #include <time.h>
 #include <unistd.h>
+#include <support/check.h>
 #include "tst-mqueue.h"
 
 static void
@@ -48,11 +49,14 @@ do_test (void)
 
   if (q == (mqd_t) -1)
     {
+      if (errno == ENOSYS)
+       FAIL_UNSUPPORTED ("mq_open not supported");
+
       printf ("mq_open failed with: %m\n");
-      return result;
+      return 1;
     }
-  else
-    add_temp_mq (name);
+
+  add_temp_mq (name);
 
   mqd_t q2 = mq_open (name, O_CREAT | O_EXCL | O_RDWR, 0600, &attr);
   if (q2 != (mqd_t) -1)

diff --git a/rt/tst-mqueue3.c b/rt/tst-mqueue3.c
index 812602e2c794271ddba3ada7fca7d98977d54ab4..634db921e6935d95a046400703d75ddb99245c28 100644 (file)
--- a/rt/tst-mqueue3.c
+++ b/rt/tst-mqueue3.c
@@ -27,6 +27,7 @@
 #include <sys/mman.h>
 #include <sys/wait.h>
 #include <unistd.h>
+#include <support/check.h>
 
 #if _POSIX_THREADS
 # include <pthread.h>
@@ -161,15 +162,13 @@ do_test (void)
   /* Create the message queue.  */
   struct mq_attr attr = { .mq_maxmsg = MAXMSG, .mq_msgsize = MSGSIZE };
   m = mq_open (mqname, O_CREAT | O_EXCL | O_RDWR, 0600, &attr);
+
   if (m == -1)
     {
       if (errno == ENOSYS)
-       {
-         puts ("not implemented");
-         return 0;
-       }
+       FAIL_UNSUPPORTED ("mq_open not supported");
 
-      puts ("mq_open failed");
+      printf ("mq_open failed with: %m\n");
       return 1;
     }
 

diff --git a/rt/tst-mqueue4.c b/rt/tst-mqueue4.c
index ea19c27ab474ad547a89afbbb7e87d3857be329c..62d427a3ca27369b54d76e03801668e22f6a831d 100644 (file)
--- a/rt/tst-mqueue4.c
+++ b/rt/tst-mqueue4.c
@@ -29,6 +29,7 @@
 #include <sys/wait.h>
 #include <time.h>
 #include <unistd.h>
+#include <support/check.h>
 #include "tst-mqueue.h"
 
 #define TEST_FUNCTION do_test ()
@@ -45,11 +46,14 @@ do_test (void)
 
   if (q == (mqd_t) -1)
     {
+      if (errno == ENOSYS)
+       FAIL_UNSUPPORTED ("mq_open not supported");
+
       printf ("mq_open failed with: %m\n");
-      return result;
+      return 1;
     }
-  else
-    add_temp_mq (name);
+
+  add_temp_mq (name);
 
   *p = '.';
   memset (p + 1, 'x', NAME_MAX + 1 - (p - name));

diff --git a/rt/tst-mqueue5.c b/rt/tst-mqueue5.c
index 24539dbb144215e8b70acfdbd3d72ca0a55fa872..70d97a36c2e0171306c44a8ab4e0bea87fd4d3a3 100644 (file)
--- a/rt/tst-mqueue5.c
+++ b/rt/tst-mqueue5.c
@@ -30,6 +30,7 @@
 #include <sys/wait.h>
 #include <time.h>
 #include <unistd.h>
+#include <support/check.h>
 #include "tst-mqueue.h"
 
 #if _POSIX_THREADS && defined SIGRTMIN && defined SA_SIGINFO
@@ -630,11 +631,14 @@ do_test (void)
 
   if (q == (mqd_t) -1)
     {
+      if (errno == ENOSYS)
+       FAIL_UNSUPPORTED ("mq_open not supported");
+
       printf ("mq_open failed with: %m\n");
-      return result;
+      return 1;
     }
-  else
-    add_temp_mq (name);
+
+  add_temp_mq (name);
 
   struct sigevent ev;
   memset (&ev, 0xaa, sizeof (ev));

diff --git a/rt/tst-mqueue6.c b/rt/tst-mqueue6.c
index 4831bf2dc16539132f5eff29bea8e3a9dc50709c..bc875f101ef855cd33dd4497d9c1aa036e251d78 100644 (file)
--- a/rt/tst-mqueue6.c
+++ b/rt/tst-mqueue6.c
@@ -30,6 +30,7 @@
 #include <sys/wait.h>
 #include <time.h>
 #include <unistd.h>
+#include <support/check.h>
 #include "tst-mqueue.h"
 
 #if _POSIX_THREADS
@@ -116,11 +117,14 @@ do_test (void)
 
   if (q == (mqd_t) -1)
     {
+      if (errno == ENOSYS)
+       FAIL_UNSUPPORTED ("mq_open not supported");
+
       printf ("mq_open failed with: %m\n");
-      return result;
+      return 1;
     }
-  else
-    add_temp_mq (name);
+
+  add_temp_mq (name);
 
   pthread_attr_t nattr;
   if (pthread_attr_init (&nattr)

diff --git a/rt/tst-mqueue7.c b/rt/tst-mqueue7.c
index 302e9e454c9456ebcbac35fc204a395c919472b4..948c0d13269b01734ed9f0e2ff559d70272e72f9 100644 (file)
--- a/rt/tst-mqueue7.c
+++ b/rt/tst-mqueue7.c
@@ -25,6 +25,7 @@
 #include <sys/wait.h>
 #include <time.h>
 #include <unistd.h>
+#include <support/check.h>
 
 #define OPT_AFTEREXEC 20000
 

diff --git a/rt/tst-mqueue8.c b/rt/tst-mqueue8.c
index da1e7644e60fae64e6778e4d137fb1c49cbed19e..b14cde118856c8ac16a60e1a2c5c0be7c5ae4e6e 100644 (file)
--- a/rt/tst-mqueue8.c
+++ b/rt/tst-mqueue8.c
@@ -23,6 +23,7 @@
 #include <unistd.h>
 #if _POSIX_THREADS
 # include <pthread.h>
+# include <support/check.h>
 
 static pthread_barrier_t b;
 
@@ -95,8 +96,11 @@ do_test (void)
 
   if (q == (mqd_t) -1)
     {
+      if (errno == ENOSYS)
+       FAIL_UNSUPPORTED ("mq_open not supported");
+
       printf ("mq_open failed with: %m\n");
-      return 0;
+      return 1;
     }
 
   if (mq_unlink (name) != 0)

diff --git a/rt/tst-mqueue9.c b/rt/tst-mqueue9.c
index ef2233623b5be42698eabfd3013678c1ca11329b..fe991ec32fa968d252a581b2f0194704096b4ebe 100644 (file)
--- a/rt/tst-mqueue9.c
+++ b/rt/tst-mqueue9.c
@@ -21,6 +21,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#include <support/check.h>
 #include "tst-mqueue.h"
 
 #define TEST_FUNCTION do_test ()
@@ -41,11 +42,14 @@ do_test (void)
 
   if (q == (mqd_t) -1)
     {
+      if (errno == ENOSYS)
+       FAIL_UNSUPPORTED ("mq_open not supported");
+
       printf ("mq_open failed with: %m\n");
-      return 0;
+      return 1;
     }
-  else
-    add_temp_mq (name);
+
+  add_temp_mq (name);
 
   if (seteuid (1) != 0)
     {