From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-oi1-x232.google.com (mail-oi1-x232.google.com [IPv6:2607:f8b0:4864:20::232]) by sourceware.org (Postfix) with ESMTPS id 32C843858416 for ; Mon, 17 Jan 2022 17:46:41 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 32C843858416 Received: by mail-oi1-x232.google.com with SMTP id q186so24567956oih.8 for ; Mon, 17 Jan 2022 09:46:41 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:cc:references:from:in-reply-to :content-transfer-encoding; bh=PDeJPdBF9lgmIsxdSUbv8lQvMrt5mAUvCUuAAK/egLE=; b=V9CMbmTvC4xxgD1va2sX07XmS922Y3/bObEvrCUyon5s/nghewdtlSfINNs74OmZ8d YNbnG9rFjX4bEMSDtH6e3B++xTk+9lVpt85HEy9eLEvvNhSFwu2KegMB6eWDkqrbP/YR iktAD8kptj4S5LzMmSXWtD5F9EgVxhSTdveueu/H6l2B5i7VqsNgUaATEmQIVbdwvXsq cryFmDfjOVlnj3REsssvLWTzIakoEC+hxU880mN8YLsYTv6Spplx2rXf0mfWTgtEdcGC pwhVwn07fesIn2NVZpR2e6+tjgdzrS3ERhXyTkpagF+06erspAi5xlZM4OQo9yrYKSh1 NP/w== X-Gm-Message-State: AOAM530LxImuoTtGNfSZ9zKqWWwDp2MNwHwDvNCzan9AZiBJHBbcC288 UqWM/IDHyB8SAGyFcWJFJ6ru9A== X-Google-Smtp-Source: ABdhPJz22XMuiup9nf67/nHUWGXKRJlGEs8mRkbS167Qp9tF5viWqhuNSUkO73cG0hnnhCjWYjXZ2w== X-Received: by 2002:a05:6808:1293:: with SMTP id a19mr24486941oiw.29.1642441600467; Mon, 17 Jan 2022 09:46:40 -0800 (PST) Received: from ?IPV6:2804:431:c7cb:989a:152:78c4:5eab:b8b5? ([2804:431:c7cb:989a:152:78c4:5eab:b8b5]) by smtp.gmail.com with ESMTPSA id n20sm4324476otr.14.2022.01.17.09.46.39 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 17 Jan 2022 09:46:40 -0800 (PST) Message-ID: Date: Mon, 17 Jan 2022 14:46:37 -0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.5.0 Subject: Re: [PATCH] rt/tst-mqueue*: Return UNSUPPORTED when mq_open fails with ENOSYS Content-Language: en-US To: Samuel Thibault , libc-alpha@sourceware.org Cc: commit-hurd@gnu.org References: <20220115145346.304375-1-samuel.thibault@ens-lyon.org> From: Adhemerval Zanella In-Reply-To: <20220115145346.304375-1-samuel.thibault@ens-lyon.org> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-11.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, NICE_REPLY_A, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Jan 2022 17:46:43 -0000 On 15/01/2022 11:53, Samuel Thibault wrote: > Rather than returning 0 or a failure. LGTM, thanks. Reviewed-by: Adhemerval Zanella > --- > rt/tst-mqueue1.c | 10 +++++++--- > rt/tst-mqueue10.c | 10 +++++++++- > rt/tst-mqueue2.c | 10 +++++++--- > rt/tst-mqueue3.c | 9 ++++----- > rt/tst-mqueue4.c | 10 +++++++--- > rt/tst-mqueue5.c | 10 +++++++--- > rt/tst-mqueue6.c | 10 +++++++--- > rt/tst-mqueue7.c | 1 + > rt/tst-mqueue8.c | 6 +++++- > rt/tst-mqueue9.c | 10 +++++++--- > 10 files changed, 61 insertions(+), 25 deletions(-) > > diff --git a/rt/tst-mqueue1.c b/rt/tst-mqueue1.c > index 1fa807f19a..3aa0369a2b 100644 > --- a/rt/tst-mqueue1.c > +++ b/rt/tst-mqueue1.c > @@ -26,6 +26,7 @@ > #include > #include > #include > +#include > #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 9da9838258..059c064488 100644 > --- 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 18fadfe09c..b355d22474 100644 > --- a/rt/tst-mqueue2.c > +++ b/rt/tst-mqueue2.c > @@ -27,6 +27,7 @@ > #include > #include > #include > +#include > #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 812602e2c7..634db921e6 100644 > --- a/rt/tst-mqueue3.c > +++ b/rt/tst-mqueue3.c > @@ -27,6 +27,7 @@ > #include > #include > #include > +#include > > #if _POSIX_THREADS > # include > @@ -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 ea19c27ab4..62d427a3ca 100644 > --- a/rt/tst-mqueue4.c > +++ b/rt/tst-mqueue4.c > @@ -29,6 +29,7 @@ > #include > #include > #include > +#include > #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 24539dbb14..70d97a36c2 100644 > --- a/rt/tst-mqueue5.c > +++ b/rt/tst-mqueue5.c > @@ -30,6 +30,7 @@ > #include > #include > #include > +#include > #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 4831bf2dc1..bc875f101e 100644 > --- a/rt/tst-mqueue6.c > +++ b/rt/tst-mqueue6.c > @@ -30,6 +30,7 @@ > #include > #include > #include > +#include > #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 302e9e454c..948c0d1326 100644 > --- a/rt/tst-mqueue7.c > +++ b/rt/tst-mqueue7.c > @@ -25,6 +25,7 @@ > #include > #include > #include > +#include > > #define OPT_AFTEREXEC 20000 > > diff --git a/rt/tst-mqueue8.c b/rt/tst-mqueue8.c > index da1e7644e6..b14cde1188 100644 > --- a/rt/tst-mqueue8.c > +++ b/rt/tst-mqueue8.c > @@ -23,6 +23,7 @@ > #include > #if _POSIX_THREADS > # include > +# include > > 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 ef2233623b..fe991ec32f 100644 > --- a/rt/tst-mqueue9.c > +++ b/rt/tst-mqueue9.c > @@ -21,6 +21,7 @@ > #include > #include > #include > +#include > #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) > {