[gentoo-commits] repo/gentoo:master commit in: dev-libs/glib/

[Sam James]

commit:     bf113c32dca91976885504f9506eaa83479d8d54
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  3 07:55:51 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Dec  3 08:01:36 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf113c32

dev-libs/glib: use mkdir -p in src_test

It fails with multilib otherwise on the 2nd run as it already exists;
I assume this may have worked before if the test destroyed the socket?

We may want to change this to ${ABI} or something instead but then
there's the risk of the path being too long for unix sockets.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-libs/glib/glib-2.80.5.ebuild | 3 ++-
 dev-libs/glib/glib-2.82.2.ebuild | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/dev-libs/glib/glib-2.80.5.ebuild b/dev-libs/glib/glib-2.80.5.ebuild
index 89ca28c092cd..94e3af69e14d 100644
--- a/dev-libs/glib/glib-2.80.5.ebuild
+++ b/dev-libs/glib/glib-2.80.5.ebuild
@@ -317,6 +317,7 @@ multilib_src_configure() {
 multilib_src_test() {
        export XDG_CONFIG_DIRS=/etc/xdg
        export XDG_DATA_DIRS=/usr/local/share:/usr/share
+       # TODO: Use ${ABI} here to be unique for multilib?
        export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
        export LC_TIME=C # bug #411967
        export TZ=UTC
@@ -328,7 +329,7 @@ multilib_src_test() {
        addpredict /usr/b
 
        # Related test is a bit nitpicking
-       mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" || die
+       mkdir -p "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" || die
        chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" || die
 
        meson_src_test --timeout-multiplier 20 --no-suite flaky

diff --git a/dev-libs/glib/glib-2.82.2.ebuild b/dev-libs/glib/glib-2.82.2.ebuild
index a088dd47af25..2e2f890300a1 100644
--- a/dev-libs/glib/glib-2.82.2.ebuild
+++ b/dev-libs/glib/glib-2.82.2.ebuild
@@ -317,6 +317,7 @@ multilib_src_configure() {
 multilib_src_test() {
        export XDG_CONFIG_DIRS=/etc/xdg
        export XDG_DATA_DIRS=/usr/local/share:/usr/share
+       # TODO: Use ${ABI} here to be unique for multilib?
        export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
        export LC_TIME=C # bug #411967
        export TZ=UTC
@@ -328,7 +329,7 @@ multilib_src_test() {
        addpredict /usr/b
 
        # Related test is a bit nitpicking
-       mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" || die
+       mkdir -p "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" || die
        chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" || die
 
        meson_src_test --timeout-multiplier 20 --no-suite flaky