From ab084f8b967c9c5d945a83b0c79961f8fcba8407 Mon Sep 17 00:00:00 2001
From: Pierre Le Marre <dev@wismill.eu>
Date: Thu, 14 Mar 2024 09:44:01 +0100
Subject: [PATCH] tentative fixes

---
 .github/workflows/macos.yml | 16 ++++++++++++----
 test/xvfb-wrapper.c         |  2 +-
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 8d130bcf..3f3a768a 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -23,9 +23,17 @@ jobs:
           python-version: '3.12'
       - name: Install dependencies
         run: |
-          brew install bison libxml2 meson ninja pyyaml
-          brew link bison --force
+          brew install bison libxml2 meson ninja pyyaml xkeyboardconfig
           brew install xquartz --cask
+          brew link bison --force
+          echo $HOMEBREW_PREFIX
+          brew --prefix xkeyboardconfig
+          brew --prefix xquartz
+          ls -l "$(brew --prefix xkeyboardconfig)"
+          ls -l "$(brew --prefix xquartz)"
+          echo $PATH
+          which echo
+          which Xvfb
         env:
           HOMEBREW_NO_AUTO_UPDATE: 1
           HOMEBREW_NO_INSTALL_CLEANUP: 1
@@ -35,8 +43,8 @@ jobs:
             meson setup \
               -Denable-wayland=false \
               -Denable-x11=true \
-              -Dxkb-config-root=#{HOMEBREW_PREFIX}/share/X11/xkb \
-              -Dx-locale-root=#{HOMEBREW_PREFIX}/share/X11/locale \
+              -Dxkb-config-root=${HOMEBREW_PREFIX}/share/X11/xkb \
+              -Dx-locale-root=${HOMEBREW_PREFIX}/share/X11/locale \
               build
       - name: Build
         run: |
diff --git a/test/xvfb-wrapper.c b/test/xvfb-wrapper.c
index 36876162..cd35517a 100644
--- a/test/xvfb-wrapper.c
+++ b/test/xvfb-wrapper.c
@@ -117,8 +117,8 @@ xvfb_wrapper(int (*test_func)(char* display))
     rewind(display_fd);
     length = fread(&display[1], 1, sizeof(display) - 1, display_fd);
     if (length <= 0) {
-        ret = TEST_SETUP_FAILURE;
         fprintf(stderr, "fread error: length=%zu\n", length);
+        ret = TEST_SETUP_FAILURE;
         goto err_xvfd;
     } else {
         /* Drop the newline character */