Hmmm... the exit code should probably rather be forced after the xvfb killing. But let's first propagate the exit code from make test to the end of xvfb kill (see man kill: 'The value of $? after the trap action completes shall be the value it had before trap was invoked.')

1 files changed, 2 insertions, 2 deletions

diff --git a/.github/workflows/mac-build.yml b/.github/workflows/mac-build.yml
index 0250798..e13b6d6 100644
--- a/.github/workflows/mac-build.yml
+++ b/.github/workflows/mac-build.yml
@@ -119,7 +119,7 @@ jobs:
               Xvfb $1 &
               XVFB_PID=$!
               echo Launched Xvfb $1 as process $XVFB_PID >&2
-              trap "echo killing process $XVFB_PID... >&2; kill $XVFB_PID" 0
+              trap "echo killing process $XVFB_PID... >&2; kill $XVFB_PID; exit 0" 0
               export DISPLAY=$1
               sleep 2
             }
@@ -128,7 +128,7 @@ jobs:
               : do nothing
             }
           fi
-          ( runXvfb :0; make test-classic test-ttk; exit 0 ) | tee out.txt || {
+          ( runXvfb :0; make test-classic test-ttk; exit $? ) | tee out.txt || {
             echo "::error::Failure during Test"
             exit 1
           }