This is the mail archive of the libc-alpha@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: [PATCH v2] tst-ttyname: skip the test when /dev/ptmx is not available


On Mon, 25 Dec 2017 16:41:54 -0500,
Dmitry V. Levin wrote:
> 
> * sysdeps/unix/sysv/linux/tst-ttyname.c (do_in_chroot_1): Skip the
> test instead of failing in case of ENOENT returned by posix_openpt.
> ---
>  ChangeLog                             | 5 +++++
>  sysdeps/unix/sysv/linux/tst-ttyname.c | 9 ++++++++-
>  2 files changed, 13 insertions(+), 1 deletion(-)
> 
> diff --git a/sysdeps/unix/sysv/linux/tst-ttyname.c b/sysdeps/unix/sysv/linux/tst-ttyname.c
> index 0fdf1a8..6848a6d 100644
> --- a/sysdeps/unix/sysv/linux/tst-ttyname.c
> +++ b/sysdeps/unix/sysv/linux/tst-ttyname.c
> @@ -253,7 +253,14 @@ do_in_chroot_1 (int (*cb)(const char *, int))
>    /* Open the PTS that we'll be testing on.  */
>    int master;
>    char *slavename;
> -  VERIFY ((master = posix_openpt (O_RDWR|O_NOCTTY|O_NONBLOCK)) >= 0);
> +  master = posix_openpt (O_RDWR|O_NOCTTY|O_NONBLOCK);
> +  if (master < 0)
> +    {
> +      if (errno == ENOENT)
> +	FAIL_UNSUPPORTED ("posix_openpt: %m");
> +      else
> +	FAIL_EXIT1 ("posix_openpt: %m");
> +    }
>    VERIFY ((slavename = ptsname (master)));
>    VERIFY (unlockpt (master) == 0);
>    if (strncmp (slavename, "/dev/pts/", 9) != 0)
> -- 
> ldv

As I explained in a different thread: I generally support applying
this and backporting it to the 2.26 release branch.

However, shouldn't it also make this same change in do_in_chroot_2?

Of course, if do_in_chroot_1 returns EXIT_UNSUPPORTED, then
do_in_chroot_2 doesn't get to run.  But, as I think about that more, I
don't think that's the correct thing to do.

Maybe also do this?

@@ -557,12 +571,7 @@ do_test (void)
   support_become_root ();
 
   int ret1 = do_in_chroot_1 (run_chroot_tests);
-  if (ret1 == EXIT_UNSUPPORTED)
-    return ret1;
-
   int ret2 = do_in_chroot_2 (run_chroot_tests);
-  if (ret2 == EXIT_UNSUPPORTED)
-    return ret2;
 
   return  ret1 | ret2;

-- 
Happy hacking,
~ Luke Shumaker


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]