Disable the NULL buffer test in login/tst-ptsname.c.

It leads to a build failure during 'make check'.
This commit is contained in:
Arjun Shankar 2017-05-31 14:37:21 +02:00
parent 4014d6f877
commit c769a3ef7a
2 changed files with 29 additions and 1 deletions

View File

@ -0,0 +1,17 @@
Author: Arjun Shankar <arjun.is@lostca.se>
Date: Wed May 31 14:09:46 2017 +0200
Disable buf=NULL in login/tst-ptsname.c
Index: b/login/tst-ptsname.c
===================================================================
--- a/login/tst-ptsname.c
+++ b/login/tst-ptsname.c
@@ -70,7 +70,6 @@ do_test (void)
if (fd != -1)
{
result |= do_single_test (fd, buf, sizeof (buf), 0);
- result |= do_single_test (fd, NULL, sizeof (buf), EINVAL);
result |= do_single_test (fd, buf, 1, ERANGE);
close (fd);
}

View File

@ -1,6 +1,6 @@
%define glibcsrcdir glibc-2.25-362-g231a59c %define glibcsrcdir glibc-2.25-362-g231a59c
%define glibcversion 2.25.90 %define glibcversion 2.25.90
%define glibcrelease 3%{?dist} %define glibcrelease 4%{?dist}
# Pre-release tarballs are pulled in from git using a command that is # Pre-release tarballs are pulled in from git using a command that is
# effectively: # effectively:
# #
@ -295,6 +295,12 @@ Patch2037: glibc-rh1315108.patch
# sln implemented by ldconfig, to conserve disk space. # sln implemented by ldconfig, to conserve disk space.
Patch2112: glibc-rh1315476-2.patch Patch2112: glibc-rh1315476-2.patch
# Disable the NULL buffer test in login/tst-ptsname.c. It leads to a build
# failure during 'make check'. A solution is being discussed at:
# * [v1] https://sourceware.org/ml/libc-alpha/2017-05/msg00726.html
# * [v2] https://sourceware.org/ml/libc-alpha/2017-05/msg00835.html
Patch2200: glibc-Disable-buf-NULL-in-login-tst-ptsname.c
############################################################################## ##############################################################################
# End of glibc patches. # End of glibc patches.
############################################################################## ##############################################################################
@ -863,6 +869,7 @@ microbenchmark tests on the system.
%patch2037 -p1 %patch2037 -p1
%patch2112 -p1 %patch2112 -p1
%patch0061 -p1 %patch0061 -p1
%patch2200 -p1
############################################################################## ##############################################################################
# %%prep - Additional prep required... # %%prep - Additional prep required...
@ -2268,6 +2275,10 @@ rm -f *.filelist*
%endif %endif
%changelog %changelog
* Wed May 31 2017 Arjun Shankar <arjun.is@lostca.se> - 2.25.90-4
- Disable the NULL buffer test in login/tst-ptsname.c. It leads to a build
failure during 'make check'. A permanent solution is being discussed
upstream.
* Tue May 23 2017 Arjun Shankar <arjun.is@lostca.se> - 2.25.90-3 * Tue May 23 2017 Arjun Shankar <arjun.is@lostca.se> - 2.25.90-3
- Auto-sync with upstream master, - Auto-sync with upstream master,
commit 231a59ce2c5719d2d77752c21092960e28837b4a. commit 231a59ce2c5719d2d77752c21092960e28837b4a.