Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update Travis testing script to work for non-GUI builds too

Browse Source 
Skip parts that don't work in this case.
This commit is contained in:
Vadim Zeitlin
2020-04-22 21:00:28 +02:00
parent 7cfe4ee9f2
commit f1ee627736
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@@ -67,11 +67,11 @@ matrix:
name: wxGTK ARM64 name: wxGTK ARM64
- os: linux - os: linux
arch: ppc64le 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 name: wxGTK PowerPC64
- os: linux - os: linux
arch: s390x 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 name: wxGTK S/390
branches: branches:

7
build/tools/travis-ci.sh
View File

@@ -69,7 +69,7 @@ case $wxTOOLSET in
echo -en 'travis_fold:end:script.build\\r' echo -en 'travis_fold:end:script.build\\r'
echo 'Building tests...' && echo -en 'travis_fold:start:script.tests\\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 make -C tests $wxJOBS
echo -en 'travis_fold:end:script.tests\\r' echo -en 'travis_fold:end:script.tests\\r'
@@ -77,6 +77,11 @@ case $wxTOOLSET in
pushd tests && ./test && popd pushd tests && ./test && popd
echo -en 'travis_fold:end:script.testing\\r' 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 if [ "$wxUSE_XVFB" = 1 ]; then
echo 'Testing GUI using Xvfb...' && echo -en 'travis_fold:start:script.testing_gui\\r' 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 pushd tests && xvfb-run -a -s '-screen 0 1600x1200x24' ./test_gui && popd