From f1ee6277365e29933fab71fb8dea3be62ae2f62c Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 22 Apr 2020 21:00:28 +0200 Subject: [PATCH] Update Travis testing script to work for non-GUI builds too Skip parts that don't work in this case. --- .travis.yml | 4 ++-- build/tools/travis-ci.sh | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index f3682e1396..a849f64d20 100644 --- a/.travis.yml +++ b/.travis.yml @@ -67,11 +67,11 @@ matrix: name: wxGTK ARM64 - os: linux arch: ppc64le - env: wxCONFIGURE_FLAGS="--disable-sys-libs --disable-gui" wxLXC=1 + env: wxCONFIGURE_FLAGS="--disable-sys-libs --disable-gui" wxLXC=1 wxSKIP_GUI=1 name: wxGTK PowerPC64 - os: linux arch: s390x - env: wxCONFIGURE_FLAGS="--disable-sys-libs --disable-gui" wxLXC=1 + env: wxCONFIGURE_FLAGS="--disable-sys-libs --disable-gui" wxLXC=1 wxSKIP_GUI=1 name: wxGTK S/390 branches: diff --git a/build/tools/travis-ci.sh b/build/tools/travis-ci.sh index b1e3470c86..84d973f806 100755 --- a/build/tools/travis-ci.sh +++ b/build/tools/travis-ci.sh @@ -69,7 +69,7 @@ case $wxTOOLSET in echo -en 'travis_fold:end:script.build\\r' echo 'Building tests...' && echo -en 'travis_fold:start:script.tests\\r' - make -C tests $wxJOBS failtest + [ "$wxSKIP_GUI" = 1 ] || make -C tests $wxJOBS failtest make -C tests $wxJOBS echo -en 'travis_fold:end:script.tests\\r' @@ -77,6 +77,11 @@ case $wxTOOLSET in pushd tests && ./test && popd echo -en 'travis_fold:end:script.testing\\r' + if [ "$wxSKIP_GUI" = 1 ]; then + echo 'Skipping the rest of tests for non-GUI build.' + exit 0 + fi + if [ "$wxUSE_XVFB" = 1 ]; then echo 'Testing GUI using Xvfb...' && echo -en 'travis_fold:start:script.testing_gui\\r' pushd tests && xvfb-run -a -s '-screen 0 1600x1200x24' ./test_gui && popd