From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
To: libc-alpha@sourceware.org, Florian Weimer <fweimer@redhat.com>
Subject: Re: [PATCH 1/3] login/tst-grantpt: Convert to support framework, more error checking
Date: Fri, 2 Oct 2020 14:08:15 -0300 [thread overview]
Message-ID: <d3f627cb-ab6f-319a-49ad-6736fba6fe7b@linaro.org> (raw)
In-Reply-To: <9dff973d4e569a30243042a0e4c5ad45dd927c7a.1590574208.git.fweimer@redhat.com>
On 27/05/2020 07:14, Florian Weimer via Libc-alpha wrote:
> The test now requires working /dev/pts pseudo-terminals.
>
> A new subtest (test_not_ptmx) attempts to call grantpt on a
> pseudo-terminal that is not a ptmx device. POSIX requires an EINVAL
> error in this case.
LGTM, thanks.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
> ---
> login/tst-grantpt.c | 93 ++++++++++++++++++++++++++++-----------------
> 1 file changed, 58 insertions(+), 35 deletions(-)
>
> diff --git a/login/tst-grantpt.c b/login/tst-grantpt.c
> index 65bb344909..1d7a220fcf 100644
> --- a/login/tst-grantpt.c
> +++ b/login/tst-grantpt.c
> @@ -1,3 +1,21 @@
> +/* Test for grantpt error corner cases.
> + Copyright (C) 2001-2020 Free Software Foundation, Inc.
> + This file is part of the GNU C Library.
> +
> + The GNU C Library is free software; you can redistribute it and/or
> + modify it under the terms of the GNU Lesser General Public
> + License as published by the Free Software Foundation; either
> + version 2.1 of the License, or (at your option) any later version.
> +
> + The GNU C Library is distributed in the hope that it will be useful,
> + but WITHOUT ANY WARRANTY; without even the implied warranty of
> + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> + Lesser General Public License for more details.
> +
> + You should have received a copy of the GNU Lesser General Public
> + License along with the GNU C Library; if not, see
> + <https://www.gnu.org/licenses/>. */
> +
> #include <sys/types.h>
> #include <sys/stat.h>
> #include <fcntl.h>
Ok.
> @@ -6,76 +24,81 @@
> #include <errno.h>
> #include <string.h>
> #include <unistd.h>
> +#include <support/check.h>
> +#include <support/temp_file.h>
> +#include <support/xunistd.h>
>
> -static int
> +/* Test grantpt with a closed descriptor. */
> +static void
> test_ebadf (void)
> {
> int fd, ret, err;
>
> fd = posix_openpt (O_RDWR);
> if (fd == -1)
> - {
> - printf ("posix_openpt(O_RDWR) failed\nerrno %d (%s)\n",
> - errno, strerror (errno));
> - /* We don't fail because of this; maybe the system does not have
> - SUS pseudo terminals. */
> - return 0;
> - }
> - unlockpt (fd);
> - close (fd);
> + FAIL_EXIT1 ("posix_openpt(O_RDWR) failed\nerrno %d (%m)\n", errno);
> + TEST_COMPARE (unlockpt (fd), 0);
>
> + xclose (fd);
> ret = grantpt (fd);
> err = errno;
> if (ret != -1 || err != EBADF)
> {
> + support_record_failure ();
> printf ("grantpt(): expected: return = %d, errno = %d\n", -1, EBADF);
> printf (" got: return = %d, errno = %d\n", ret, err);
> - return 1;
> }
> - return 0;
> }
>
Ok.
> -static int
> +/* Test grantpt on a regular file. */
> +static void
> test_einval (void)
> {
> int fd, ret, err;
> - const char file[] = "./grantpt-einval";
>
> - fd = open (file, O_RDWR | O_CREAT, 0600);
> - if (fd == -1)
> - {
> - printf ("open(\"%s\", O_RDWR) failed\nerrno %d (%s)\n",
> - file, errno, strerror (errno));
> - return 0;
> - }
> - unlink (file);
> + fd = create_temp_file ("tst-grantpt-", NULL);
> + TEST_VERIFY_EXIT (fd >= 0);
>
> ret = grantpt (fd);
> err = errno;
> if (ret != -1 || err != EINVAL)
> {
> + support_record_failure ();
> printf ("grantpt(): expected: return = %d, errno = %d\n", -1, EINVAL);
> printf (" got: return = %d, errno = %d\n", ret, err);
> - ret = 1;
> }
> - else
> - ret = 0;
>
> - close (fd);
> + xclose (fd);
> +}
> +
Ok.
> +/* Test grantpt on a non-ptmx pseudo-terminal. */
> +static void
> +test_not_ptmx (void)
> +{
> + int ptmx = posix_openpt (O_RDWR);
> + TEST_VERIFY_EXIT (ptmx >= 0);
> + TEST_COMPARE (grantpt (ptmx), 0);
> + TEST_COMPARE (unlockpt (ptmx), 0);
> +
> + const char *name = ptsname (ptmx);
> + TEST_VERIFY_EXIT (name != NULL);
> + int pts = open (name, O_RDWR | O_NOCTTY);
> + TEST_VERIFY_EXIT (pts >= 0);
> +
> + TEST_COMPARE (grantpt (pts), -1);
> + TEST_COMPARE (errno, EINVAL);
>
> - return ret;
> + xclose (pts);
> + xclose (ptmx);
> }
>
Ok.
> static int
> do_test (void)
> {
> - int result = 0;
> -
> - result += test_ebadf ();
> - result += test_einval ();
> -
> - return result;
> + test_ebadf ();
> + test_einval ();
> + test_not_ptmx ();
> + return 0;
> }
>
> -#define TEST_FUNCTION do_test ()
> -#include "../test-skeleton.c"
> +#include <support/test-driver.c>
>
Ok.
next prev parent reply other threads:[~2020-10-02 17:08 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-27 10:14 [PATCH 0/3] Linux: Rework Linux PTY support Florian Weimer
2020-05-27 10:14 ` [PATCH 1/3] login/tst-grantpt: Convert to support framework, more error checking Florian Weimer
2020-10-02 17:08 ` Adhemerval Zanella [this message]
2020-05-27 10:14 ` [PATCH 2/3] Linux: unlockpt needs to fail with EINVAL, not ENOTTY (bug 26053) Florian Weimer
2020-10-02 17:10 ` Adhemerval Zanella
2020-05-27 10:14 ` [PATCH 3/3] Linux: Require properly configured /dev/pts for PTYs Florian Weimer
2020-05-27 10:31 ` Christian Brauner
2020-10-02 17:20 ` Adhemerval Zanella
2020-10-02 17:26 ` Florian Weimer
2020-10-07 9:31 ` Florian Weimer
2020-08-05 7:14 [PATCH 1/3] login/tst-grantpt: Convert to support framework, more error checking Florian Weimer
2020-08-13 18:21 ` Adhemerval Zanella
2020-08-13 18:31 ` Florian Weimer
2020-08-13 18:58 ` Adhemerval Zanella
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=d3f627cb-ab6f-319a-49ad-6736fba6fe7b@linaro.org \
--to=adhemerval.zanella@linaro.org \
--cc=fweimer@redhat.com \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).