Launch Xvfb before running non-GUI tests in GitHub wxMSW workflow

We must be able to create windows even in non-GUI tests for the windows
used internally, e.g. the one created during wxSocket initialization, so
ensure Xvfb is running before the tests start.
This commit is contained in:
Vadim Zeitlin
2021-06-27 18:46:29 +01:00
parent 938a0dd919
commit 3c714de200

View File

@@ -161,22 +161,7 @@ jobs:
make $wxMAKE_ARGS failtest make $wxMAKE_ARGS failtest
make $wxMAKE_ARGS "CXXFLAGS=$wxMAKEFILE_ERROR_CXXFLAGS" make $wxMAKE_ARGS "CXXFLAGS=$wxMAKEFILE_ERROR_CXXFLAGS"
- name: Run non-GUI tests - name: Launch Xvfb
working-directory: tests
run: |
. ../build/tools/httpbin.sh
httpbin_launch
$WINERUN ./test || rc=$?
if [ -n "$rc" ]; then
httpbin_show_log
exit $rc
fi
- name: Run GUI tests
working-directory: tests
run: | run: |
echo 'Launching Xvfb...' echo 'Launching Xvfb...'
sudo mkdir /tmp/.X11-unix sudo mkdir /tmp/.X11-unix
@@ -202,5 +187,24 @@ jobs:
echo "Still waiting for Xvfb (attempt #$num_tries)" echo "Still waiting for Xvfb (attempt #$num_tries)"
sleep 3 sleep 3
done done
echo 'Launching the GUI test:' echo 'Xvfb is running on display :10'
DISPLAY=:10 $WINERUN ./test_gui echo 'DISPLAY=:10' >> $GITHUB_ENV
- name: Run non-GUI tests
working-directory: tests
run: |
. ../build/tools/httpbin.sh
httpbin_launch
$WINERUN ./test || rc=$?
if [ -n "$rc" ]; then
httpbin_show_log
exit $rc
fi
- name: Run GUI tests
working-directory: tests
run: |
$WINERUN ./test_gui