From 8ded2e75400a506858540110fb837b1777f01d2c Mon Sep 17 00:00:00 2001
From: "Andreas K. Huettel" <dilfridge@gentoo.org>
Date: Sun, 22 Mar 2020 11:02:40 +0100
Subject: [PATCH] sys-libs/glibc: add XFAIL mechanism to 9999

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Andreas K. Huettel <dilfridge@gentoo.org>
---
 sys-libs/glibc/glibc-9999.ebuild | 33 +++++++++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
index 7af2bc9cf75b..fc5b12bfb5e9 100644
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-9999.ebuild
@@ -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
 #
@@ -1139,11 +1159,22 @@ src_compile() {
 
 glibc_src_test() {
 	cd "$(builddir nptl)"
+
+	local myxfailparams=""
+	if [[ "${GENTOO_GLIBC_XFAIL_TESTS}" == "yes" ]] ; then
+		for myt in ${XFAIL_TEST_LIST[@]} ; do
+			myxfailparams+="test-xfail-${myt}=yes "
+		done
+	fi
+
 	# disable tests:
 	# - tests-container:
 	#     sandbox does not understand unshare() and prevents
 	#     writes to /proc/
-	emake check tests-container=
+	# emake ${myxfailparams} check tests-container=
+	# if possible let's list them (unless it's *all* container tests)
+
+	emake ${myxfailparams} check
 }
 
 do_src_test() {
-- 
2.26.2