Skip to content
GitLab
Explore
Sign in
Register
Commits on Source (2)
debian/patches/hurd-i386/local-fix-nss.diff: Fix tst-nss-test3 test
· bed7ac3c
Samuel Thibault
authored
Feb 22, 2019
bed7ac3c
Merge branch 'glibc-2.29' of salsa.debian.org:glibc-team/glibc into glibc-2.29
· d480bb26
Samuel Thibault
authored
Feb 22, 2019
d480bb26
Show whitespace changes
Inline
Side-by-side
debian/changelog
View file @
d480bb26
...
...
@@ -41,6 +41,7 @@ glibc (2.29-0experimental0) UNRELEASED; urgency=medium
[ Samuel Thibault ]
* debian/patches/hurd-i386/submitted-net.diff: Rebased.
* debian/patches/hurd-i386/tg-bits_atomic.h_multiple_threads.diff: Rebased.
* debian/patches/hurd-i386/local-fix-nss.diff: Fix tst-nss-test3 test.
-- Adam Conrad <adconrad@0c3.net> Wed, 20 Feb 2019 01:22:52 -0700
...
...
debian/patches/hurd-i386/local-fix-nss.diff
0 → 100644
View file @
d480bb26
TODO:
make the Makefile part newns-support-specific
make the main Makefile put tests-container in unsupported tests when newns is not supported.
Index: glibc-2.29/nss/tst-nss-test3.c
===================================================================
--- glibc-2.29.orig/nss/tst-nss-test3.c
+++ glibc-2.29/nss/tst-nss-test3.c
@@ -16,6 +16,7 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
+#include <sched.h>
#include <nss.h>
#include <stdio.h>
#include <stdlib.h>
@@ -107,12 +108,15 @@
do_test (void)
int i;
struct group *g = NULL;
+#ifndef CLONE_NEWNS
+ __nss_configure_lookup ("group", "test1");
+#else
/* Previously we used __nss_configure_lookup to isolate the test
from the host environment and to get it to lookup from our new
test1 NSS service module, but now this test is run in a different
root filesystem via the test-container support and we directly
configure the use of the test1 NSS service. */
- __nss_configure_lookup ("group", "test1");
+#endif
setgrent ();
Index: glibc-2.29/nss/Makefile
===================================================================
--- glibc-2.29.orig/nss/Makefile
+++ glibc-2.29/nss/Makefile
@@ -59,7 +59,7 @@
tests = test-netdb test-digits-dots ts
tst-nss-test5
xtests = bug-erange
-tests-container = \
+tests += \
tst-nss-test3
# Tests which need libdl
debian/patches/series.hurd-i386
View file @
d480bb26
...
...
@@ -9,3 +9,4 @@ hurd-i386/local-versions-hack.diff
hurd-i386/unsubmitted-prof-eintr.diff
hurd-i386/tg-glibc-2.24-restore-malloc-hook.diff
hurd-i386/unsubmitted-getaux_at_secure.diff
hurd-i386/local-fix-nss.diff