From cda927fb0d36cdb0563413cc92818dcf358dd0df Mon Sep 17 00:00:00 2001 From: Matoro Mahri Date: Thu, 25 Apr 2024 23:48:40 -0400 Subject: sys-libs/glibc: skip tst-nice with nice 19 Fails otherwise, because it expects to see a change when bumping niceness, but no change can be make when niceness is already at max. Bug: https://bugs.gentoo.org/927238 Signed-off-by: Matoro Mahri Closes: https://github.com/gentoo/gentoo/pull/36429 Signed-off-by: Sam James --- sys-libs/glibc/glibc-2.38-r10.ebuild | 5 +++++ sys-libs/glibc/glibc-2.38-r11.ebuild | 5 +++++ sys-libs/glibc/glibc-2.38-r12.ebuild | 5 +++++ sys-libs/glibc/glibc-2.38-r13.ebuild | 5 +++++ sys-libs/glibc/glibc-2.39-r3.ebuild | 5 +++++ sys-libs/glibc/glibc-2.39-r4.ebuild | 5 +++++ sys-libs/glibc/glibc-9999.ebuild | 5 +++++ 7 files changed, 35 insertions(+) diff --git a/sys-libs/glibc/glibc-2.38-r10.ebuild b/sys-libs/glibc/glibc-2.38-r10.ebuild index 5fca93e98070..a60562d5f8ce 100644 --- a/sys-libs/glibc/glibc-2.38-r10.ebuild +++ b/sys-libs/glibc/glibc-2.38-r10.ebuild @@ -1266,6 +1266,11 @@ glibc_src_test() { ewarn "Skipping extra tests because in systemd-nspawn container" XFAIL_TEST_LIST+=( "${XFAIL_NSPAWN_TEST_LIST[@]}" ) fi + if [[ "$(nice)" == "19" ]] ; then + # Expects to be able to increase niceness, which it can't do if + # already at the highest nice value + XFAIL_TEST_LIST+=( "tst-nice" ) + fi for myt in ${XFAIL_TEST_LIST[@]} ; do myxfailparams+="test-xfail-${myt}=yes " diff --git a/sys-libs/glibc/glibc-2.38-r11.ebuild b/sys-libs/glibc/glibc-2.38-r11.ebuild index 93f0999d1d03..17e29f36c3fe 100644 --- a/sys-libs/glibc/glibc-2.38-r11.ebuild +++ b/sys-libs/glibc/glibc-2.38-r11.ebuild @@ -1272,6 +1272,11 @@ glibc_src_test() { ewarn "Skipping extra tests because in systemd-nspawn container" XFAIL_TEST_LIST+=( "${XFAIL_NSPAWN_TEST_LIST[@]}" ) fi + if [[ "$(nice)" == "19" ]] ; then + # Expects to be able to increase niceness, which it can't do if + # already at the highest nice value + XFAIL_TEST_LIST+=( "tst-nice" ) + fi for myt in ${XFAIL_TEST_LIST[@]} ; do myxfailparams+="test-xfail-${myt}=yes " diff --git a/sys-libs/glibc/glibc-2.38-r12.ebuild b/sys-libs/glibc/glibc-2.38-r12.ebuild index 9c1814df87de..3faaa1af693c 100644 --- a/sys-libs/glibc/glibc-2.38-r12.ebuild +++ b/sys-libs/glibc/glibc-2.38-r12.ebuild @@ -1272,6 +1272,11 @@ glibc_src_test() { ewarn "Skipping extra tests because in systemd-nspawn container" XFAIL_TEST_LIST+=( "${XFAIL_NSPAWN_TEST_LIST[@]}" ) fi + if [[ "$(nice)" == "19" ]] ; then + # Expects to be able to increase niceness, which it can't do if + # already at the highest nice value + XFAIL_TEST_LIST+=( "tst-nice" ) + fi for myt in ${XFAIL_TEST_LIST[@]} ; do myxfailparams+="test-xfail-${myt}=yes " diff --git a/sys-libs/glibc/glibc-2.38-r13.ebuild b/sys-libs/glibc/glibc-2.38-r13.ebuild index 11905f8503e2..f8c587470c6d 100644 --- a/sys-libs/glibc/glibc-2.38-r13.ebuild +++ b/sys-libs/glibc/glibc-2.38-r13.ebuild @@ -1272,6 +1272,11 @@ glibc_src_test() { ewarn "Skipping extra tests because in systemd-nspawn container" XFAIL_TEST_LIST+=( "${XFAIL_NSPAWN_TEST_LIST[@]}" ) fi + if [[ "$(nice)" == "19" ]] ; then + # Expects to be able to increase niceness, which it can't do if + # already at the highest nice value + XFAIL_TEST_LIST+=( "tst-nice" ) + fi for myt in ${XFAIL_TEST_LIST[@]} ; do myxfailparams+="test-xfail-${myt}=yes " diff --git a/sys-libs/glibc/glibc-2.39-r3.ebuild b/sys-libs/glibc/glibc-2.39-r3.ebuild index 8a1b09f69a23..bfab9dd8ed28 100644 --- a/sys-libs/glibc/glibc-2.39-r3.ebuild +++ b/sys-libs/glibc/glibc-2.39-r3.ebuild @@ -1276,6 +1276,11 @@ glibc_src_test() { ewarn "Skipping extra tests because in systemd-nspawn container" XFAIL_TEST_LIST+=( "${XFAIL_NSPAWN_TEST_LIST[@]}" ) fi + if [[ "$(nice)" == "19" ]] ; then + # Expects to be able to increase niceness, which it can't do if + # already at the highest nice value + XFAIL_TEST_LIST+=( "tst-nice" ) + fi for myt in ${XFAIL_TEST_LIST[@]} ; do myxfailparams+="test-xfail-${myt}=yes " diff --git a/sys-libs/glibc/glibc-2.39-r4.ebuild b/sys-libs/glibc/glibc-2.39-r4.ebuild index 5d05b046a06e..8fe8030a9e56 100644 --- a/sys-libs/glibc/glibc-2.39-r4.ebuild +++ b/sys-libs/glibc/glibc-2.39-r4.ebuild @@ -1276,6 +1276,11 @@ glibc_src_test() { ewarn "Skipping extra tests because in systemd-nspawn container" XFAIL_TEST_LIST+=( "${XFAIL_NSPAWN_TEST_LIST[@]}" ) fi + if [[ "$(nice)" == "19" ]] ; then + # Expects to be able to increase niceness, which it can't do if + # already at the highest nice value + XFAIL_TEST_LIST+=( "tst-nice" ) + fi for myt in ${XFAIL_TEST_LIST[@]} ; do myxfailparams+="test-xfail-${myt}=yes " diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild index 93936304f66f..3a053a9de724 100644 --- a/sys-libs/glibc/glibc-9999.ebuild +++ b/sys-libs/glibc/glibc-9999.ebuild @@ -1276,6 +1276,11 @@ glibc_src_test() { ewarn "Skipping extra tests because in systemd-nspawn container" XFAIL_TEST_LIST+=( "${XFAIL_NSPAWN_TEST_LIST[@]}" ) fi + if [[ "$(nice)" == "19" ]] ; then + # Expects to be able to increase niceness, which it can't do if + # already at the highest nice value + XFAIL_TEST_LIST+=( "tst-nice" ) + fi for myt in ${XFAIL_TEST_LIST[@]} ; do myxfailparams+="test-xfail-${myt}=yes " -- cgit v1.2.3-65-gdbad