[mutter/wip/carlosg/unthrottled-wayland] ci: Force a valid xcursor path
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter/wip/carlosg/unthrottled-wayland] ci: Force a valid xcursor path
- Date: Sun, 18 Jul 2021 09:51:54 +0000 (UTC)
commit 1c7aa0e611643d7ac17e839e8e40d0022fde2eb2
Author: Carlos Garnacho <carlosg gnome org>
Date: Sat Jul 17 18:15:39 2021 +0200
ci: Force a valid xcursor path
The aarch64 tests somehow don't seem to find xcursor icons, make
all tests look at the default location.
.gitlab-ci.yml | 2 ++
src/backends/meta-cursor-sprite-xcursor.c | 5 ++++-
2 files changed, 6 insertions(+), 1 deletion(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 771a8f010b..f13ed80bae 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -197,7 +197,9 @@ build-without-native-backend-and-wayland@x86_64:
G_SLICE: "always-malloc"
MALLOC_CHECK_: "3"
NO_AT_BRIDGE: "1"
+ XCURSOR_PATH: "/usr/share/icons/"
script:
+ - ls -l /usr/share/icons/
- mkdir -m 700 $XDG_RUNTIME_DIR
- dbus-run-session -- bash -x ./.gitlab-ci/run-tests.sh
artifacts:
diff --git a/src/backends/meta-cursor-sprite-xcursor.c b/src/backends/meta-cursor-sprite-xcursor.c
index 96942e3fe1..25e9ac946a 100644
--- a/src/backends/meta-cursor-sprite-xcursor.c
+++ b/src/backends/meta-cursor-sprite-xcursor.c
@@ -168,7 +168,10 @@ load_cursor_on_client (MetaCursor cursor, int scale)
if (xcursor_images)
return xcursor_images;
- g_warning_once ("No cursor theme available, please install a cursor theme");
+ g_warning_once ("No '%s' cursor theme available for size %d (scale %d),"
+ " please install a cursor theme",
+ meta_prefs_get_cursor_theme ()
+ meta_prefs_get_cursor_size, scale);
fallback_size = 24 * scale;
xcursor_images = XcursorImagesCreate (1);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]