commit:     6d8a7e849a99c0c1e4810c6da4e7b819f55adffb
Author:     Peter Leese <inbox <AT> peterleese <DOT> org>
AuthorDate: Tue Jan 20 07:04:36 2026 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jan 20 07:53:36 2026 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d8a7e84

net-misc/kea: fix tests fail to run

With update to using meson v1.10, the output format from the
meson test --list command has changed that caused the tests to
fail to run due to a parsing error.

Bug: https://bugs.gentoo.org/968667
Signed-off-by: Peter Leese <inbox <AT> peterleese.org>
Part-of: https://github.com/gentoo/gentoo/pull/45455
Closes: https://github.com/gentoo/gentoo/pull/45455
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-misc/kea/kea-3.0.2-r1.ebuild | 11 ++++++++---
 net-misc/kea/kea-9999.ebuild     | 11 ++++++++---
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/net-misc/kea/kea-3.0.2-r1.ebuild b/net-misc/kea/kea-3.0.2-r1.ebuild
index ec1107fe6d4a..223e63ef4170 100644
--- a/net-misc/kea/kea-3.0.2-r1.ebuild
+++ b/net-misc/kea/kea-3.0.2-r1.ebuild
@@ -163,13 +163,18 @@ src_test() {
        # Get list of all test suites into an associative array
        # the meson test --list returns either "kea / test_suite", 
"kea:shell-tests / test_suite" or
        # "kea:python-tests / test_suite"
+       # Note: In meson >= 1.10 the format has changed to
+       # the meson test --list returns either "kea:test_suite", "shell-tests - 
kea:test_suite" or
+       # "python-tests - kea:test_suite"
+       #
        # Discard the shell tests as we can't run shell tests in sandbox
 
        pushd "${BUILD_DIR}" || die
        local -A TEST_SUITES
-       while IFS=" / " read -r subsystem test_suite ; do
-               if [[ ${subsystem} != "kea:shell-tests" ]]; then
-                       TEST_SUITES["$test_suite"]=1
+
+       while IFS="/: " read -a words ; do
+               if [[ "${words[0]}" != "shell-tests" ]] && [[ "${words[2]}" != 
"shell-tests" ]]; then
+                       TEST_SUITES["${words[-1]}"]=1
                fi
        done < <(meson test --list || die)
        popd

diff --git a/net-misc/kea/kea-9999.ebuild b/net-misc/kea/kea-9999.ebuild
index 954594c025d0..c487f11ec6f6 100644
--- a/net-misc/kea/kea-9999.ebuild
+++ b/net-misc/kea/kea-9999.ebuild
@@ -160,13 +160,18 @@ src_test() {
        # Get list of all test suites into an associative array
        # the meson test --list returns either "kea / test_suite", 
"kea:shell-tests / test_suite" or
        # "kea:python-tests / test_suite"
+       # Note: In meson >= 1.10 the format has changed to
+       # the meson test --list returns either "kea:test_suite", "shell-tests - 
kea:test_suite" or
+       # "python-tests - kea:test_suite"
+       #
        # Discard the shell tests as we can't run shell tests in sandbox
 
        pushd "${BUILD_DIR}" || die
        local -A TEST_SUITES
-       while IFS=" / " read -r subsystem test_suite ; do
-               if [[ ${subsystem} != "kea:shell-tests" ]]; then
-                       TEST_SUITES["$test_suite"]=1
+
+       while IFS="/: " read -a words ; do
+               if [[ "${words[0]}" != "shell-tests" ]] && [[ "${words[2]}" != 
"shell-tests" ]]; then
+                       TEST_SUITES["${words[-1]}"]=1
                fi
        done < <(meson test --list || die)
        popd

Reply via email to