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

Only run GUI tests for the selected wxGTK builds

Browse Source 
The tests are known to fail for the other tested ports, so don't enable
them for now.

Also, using a special environment variable allows to detect when the
test is being run under Xvfb, which behaves differently from the normal
X server in some cases.
This commit is contained in:
Vadim Zeitlin
2019-07-17 12:32:20 +02:00
parent e5b76a3b13
commit 342494e5f4
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.travis.yml
View File

@@ -9,17 +9,18 @@ matrix:
include: include:
- dist: precise - dist: precise
compiler: gcc compiler: gcc
env: wxUSE_XVFB=1
- dist: trusty - dist: trusty
compiler: gcc compiler: gcc
- dist: trusty - dist: trusty
compiler: gcc compiler: gcc
env: wxCONFIGURE_FLAGS="--enable-utf8 --enable-utf8only --enable-monolithic" env: wxCONFIGURE_FLAGS="--enable-utf8 --enable-utf8only --enable-monolithic" wxUSE_XVFB=1
- dist: trusty - dist: trusty
compiler: gcc compiler: gcc
env: wxGTK_VERSION=3 wxCONFIGURE_FLAGS="--enable-cxx11 --enable-stl" wxMAKEFILE_FLAGS="CXXFLAGS=-std=c++11" env: wxGTK_VERSION=3 wxCONFIGURE_FLAGS="--enable-cxx11 --enable-stl" wxMAKEFILE_FLAGS="CXXFLAGS=-std=c++11" wxUSE_XVFB=1
- dist: trusty - dist: trusty
compiler: clang compiler: clang
env: wxCONFIGURE_FLAGS="--disable-shared --disable-sys-libs --disable-webview" env: wxCONFIGURE_FLAGS="--disable-shared --disable-sys-libs --disable-webview" wxUSE_XVFB=1
- dist: trusty - dist: trusty
compiler: gcc compiler: gcc
env: wxTOOLSET=cmake wxCMAKE_GENERATOR="Unix Makefiles" env: wxTOOLSET=cmake wxCMAKE_GENERATOR="Unix Makefiles"

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

@@ -66,8 +66,8 @@ 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 [ "$(uname -s)" = "Linux" ]; then if [ "$wxUSE_XVFB" = 1 ]; then
echo 'Testing GUI...' && 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 ./test_gui && popd pushd tests && xvfb-run -a ./test_gui && popd
echo -en 'travis_fold:end:script.testing_gui\\r' echo -en 'travis_fold:end:script.testing_gui\\r'
fi fi