This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch release/2.26/master updated. glibc-2.26-128-g989f59d
- From: ldv at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 9 Jan 2018 14:10:26 -0000
- Subject: GNU C Library master sources branch release/2.26/master updated. glibc-2.26-128-g989f59d
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, release/2.26/master has been updated
via 989f59db3940ab4b76176af9a62b6980eafb7a22 (commit)
from bfda785841346038d338b8c4c8eb590737c6dbf5 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=989f59db3940ab4b76176af9a62b6980eafb7a22
commit 989f59db3940ab4b76176af9a62b6980eafb7a22
Author: Dmitry V. Levin <ldv@altlinux.org>
Date: Mon Dec 25 02:30:32 2017 +0000
tst-ttyname: skip the test when /dev/ptmx is not available
* 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.
(cherry picked from commit d7ff3f11b64a28273285d341f795217bbf18ac9c)
diff --git a/ChangeLog b/ChangeLog
index 929f846..f921251 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2018-01-08 Dmitry V. Levin <ldv@altlinux.org>
+
+ * 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.
+
2017-12-29 Aurelien Jarno <aurelien@aurel32.net>
[BZ #22611]
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)
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 5 +++++
sysdeps/unix/sysv/linux/tst-ttyname.c | 9 ++++++++-
2 files changed, 13 insertions(+), 1 deletions(-)
hooks/post-receive
--
GNU C Library master sources