summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2024-12-03 07:55:51 +0000
committerSam James <sam@gentoo.org>2024-12-03 08:01:36 +0000
commitbf113c32dca91976885504f9506eaa83479d8d54 (patch)
tree3fe102ee6f8b62404cef44ee071d302a9ccb6cb1
parentdev-libs/glib: build minimal glib for bootstrapping introspection (diff)
downloadgentoo-bf113c32dca91976885504f9506eaa83479d8d54.tar.gz
gentoo-bf113c32dca91976885504f9506eaa83479d8d54.tar.bz2
gentoo-bf113c32dca91976885504f9506eaa83479d8d54.zip
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@gentoo.org>
-rw-r--r--dev-libs/glib/glib-2.80.5.ebuild3
-rw-r--r--dev-libs/glib/glib-2.82.2.ebuild3
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