commit: 7626824f263d24828f393251fc357fe6060b85f5
Author: Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 21 21:42:02 2020 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Mar 21 23:16:50 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7626824f
sys-libs/glibc: Fixes in 2.30 testsuite
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Andreas K. Huettel <dilfridge <AT> gentoo.org>
sys-libs/glibc/Manifest | 2 +-
sys-libs/glibc/glibc-2.30-r6.ebuild | 32 ++++++++++++++++++++++++++++++--
2 files changed, 31 insertions(+), 3 deletions(-)
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index dcd0e760f61..bbdde0350f7 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -15,7 +15,7 @@ DIST glibc-2.28.tar.xz 16484344 BLAKE2B
9aa8cbd5a145c2a6fde3a60b3d0a14b12b46ed79
DIST glibc-2.29-patches-8.tar.xz 102712 BLAKE2B
49aacff358c0f8499c444e73eec92f402b81236d6a91d1fc9864f974c5cb72fc5c87bf5ee77700a8333db4c68892b3940948158530cea0d0fbbda51df0ae7953
SHA512
7a929e023294e6b76569120cc234bc862f3e260994e56c3a2fc2b969b7313c94a47de7ef85f4e93c9083c16fde987ca470ab9d69d881ab49a22f5fd3a721703a
DIST glibc-2.29.tar.xz 16515488 BLAKE2B
b754e6825176538a2b8ca03fce014f0d87d333dc4d038bf0cda5ee8a2f484cd3ce93ad78ec126737e093ab64b55ceedf04cd08aecb4f8041daaa329e99717afa
SHA512
146bc0769fe853d9edbf93cea7f74c5b3d84d69cb7614c62588e7acdecd1ec789a9d8949f3e8b99f8f36f2ccac740a003bed94f32b07817baf780b06cfeb6ed0
DIST glibc-2.30-patches-6.tar.xz 66612 BLAKE2B
21ce2de45c1bd847ddf0e4e848e0d7adccc77eb91d452b9a81404b46c44ae681f31f8f41c156a782ec9390cf0d5f4d741f6a393ff6dca65b8091f126c1a30623
SHA512
0871ae71a67b21339055ac05dcb634f3b705ae44c10e7ac51e19f15196232349ed9b79a856c5e9f681dd44f9b946bbbfe170e9195819e76d0ca95dba7cede71b
-DIST glibc-2.30-patches-7.tar.xz 70632 BLAKE2B
5442262a4566a18a9a43fa5348365e6299873db320aa6e530ab8ded27cbac137ccbbccf8f0d7954facc6650fea935c9824ea94d69619e30cff9d17b912dec77e
SHA512
d33787dcc0e1b4a45e91babe3b87cf979fa5f32d1b285d8f1d0d13729a692606ff65527d5c189f0b3b3c1bec735fda40682399eb8d66897dad49101ddfa195ec
+DIST glibc-2.30-patches-8.tar.xz 71432 BLAKE2B
149ea765ca1aceafc3237db7362766503a0a1e5c59e82781023bf3da59690502997acebbbeca8712c8c19070951268321affe929d8777b5f3ab3e4f01bb6375f
SHA512
6e953a21f858edabe03713951f7b9435d0329ad652b70836911f6a3dc8d49661f03d8f98315ded127af8be315c5ba928a94bc54cfdf37d48a5f9d1e7f9b4f92e
DIST glibc-2.30.tar.xz 16576920 BLAKE2B
bd5aae4c9854f40785b91f83c3b632de6d48d811027ddfe61651cb1bc617db8017d7914c23a770cdd3feed06fcc316da841eea916cdba54179e7eace4ea45484
SHA512
37483990cd653685873e96c45dd1651b32b441b6d7919a68ebe3bae31a0c3f7ce183fc9b110f0b268b353f80312f18370559a1e7aecea0e5aa755c8f2aef1d6b
DIST glibc-2.31-patches-2.tar.xz 23736 BLAKE2B
181ba7f774e2964efdbe6f9f0540c27e18afe76854efcad3be5e5c277cf2e671d0f21752d1d42cb82f1e60a58f76f89a4997c12b74585f88ecbab85dff459c63
SHA512
1e9ae2e0cfffd80cc7219a7f989e18987b0ecaaa6e92516f823c7f3febb8fb5c86d8d9c3d9fecb98fdda699f6d7b00660d6ca3f2fee84db60f16a76d723d0b7e
DIST glibc-2.31.tar.xz 16676764 BLAKE2B
91df1792345f157265eae405185a81fd4b8ce36d4c2388f44b0d5b1ae38174ea374cbc909cd260770b9f38ea58051da13766d4fa22abf41c2d4a2493257b179b
SHA512
735e4c0ef10418b6ea945ad3906585e5bbd8b282d76f2131309dce4cec6b15066a5e4a3731773ce428a819b542579c9957867bb0abf05ed2030983fca4412306
diff --git a/sys-libs/glibc/glibc-2.30-r6.ebuild
b/sys-libs/glibc/glibc-2.30-r6.ebuild
index 2740fe7453b..45338dc43dd 100644
--- a/sys-libs/glibc/glibc-2.30-r6.ebuild
+++ b/sys-libs/glibc/glibc-2.30-r6.ebuild
@@ -28,7 +28,7 @@ RELEASE_VER=${PV}
GCC_BOOTSTRAP_VER=20180511
# Gentoo patchset
-PATCH_VER=7
+PATCH_VER=8
PATCH_DEV=dilfridge
SRC_URI+="
https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${P}-patches-${PATCH_VER}.tar.xz";
@@ -129,6 +129,26 @@ else
PDEPEND+=" !vanilla? ( sys-libs/timezone-data )"
fi
+# Ignore tests whitelisted below
+GENTOO_GLIBC_XFAIL_TESTS="${GENTOO_GLIBC_XFAIL_TESTS:-yes}"
+
+# The following tests fail due to the Gentoo build system and are thus
+# executed but ignored:
+XFAIL_TEST_LIST=(
+ # 1) Sandbox
+ tst-ldconfig-bad-aux-cache
+ tst-pldd
+ tst-mallocfork2
+ tst-nss-db-endgrent
+ tst-nss-db-endpwent
+ tst-nss-files-hosts-long
+ tst-nss-test3
+ # 2) Namespaces and cgroup
+ tst-locale-locpath
+ # 9) Failures of unknown origin
+ tst-latepthread
+)
+
#
# Small helper functions
#
@@ -1138,7 +1158,15 @@ src_compile() {
glibc_src_test() {
cd "$(builddir nptl)"
- emake check
+
+ local myxfailparams=""
+ if [[ "${GENTOO_GLIBC_XFAIL_TESTS}" == "yes" ]] ; then
+ for myt in ${XFAIL_TEST_LIST[@]} ; do
+ myxfailparams+="test-xfail-${myt}=yes "
+ done
+ fi
+
+ emake ${myxfailparams} check
}
do_src_test() {
