Merge mac_workflow branch

tcltk · May 22, 2021 · 4ba5025 · 4ba5025
2 parents 58d77bf + 8914fa4
commit 4ba5025
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/.github/workflows/mac-build.yml b/.github/workflows/mac-build.yml
@@ -34,7 +34,7 @@ jobs:
         # This involves black magic
         run: |
           brew install --cask xquartz
-          sudo /opt/X11/lib/X11/xinit/privileged_startx.d/10-tmpdirs || true
+          sudo /opt/X11/libexec/privileged_startx || true
       - name: Configure (symbols=${{ matrix.symbols }} ${{matrix.options }})
         # Note that macOS is always a 64 bit platform
         run: |
@@ -59,7 +59,6 @@ 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
               export DISPLAY=$1
               sleep 2
             }
@@ -73,7 +72,7 @@ jobs:
             exit 1
           }
           cat out.txt | grep -q "Failed	[1-9]" && {
-            echo "::error::Failure during Test"
+            echo "::error::Failure in test results"
             exit 1
           }
         env: