Only run GUI tests for the selected wxGTK builds
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:
parent
e5b76a3b13
commit
342494e5f4
@ -9,17 +9,18 @@ matrix:
|
||||
include:
|
||||
- dist: precise
|
||||
compiler: gcc
|
||||
env: wxUSE_XVFB=1
|
||||
- dist: trusty
|
||||
compiler: gcc
|
||||
- dist: trusty
|
||||
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
|
||||
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
|
||||
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
|
||||
compiler: gcc
|
||||
env: wxTOOLSET=cmake wxCMAKE_GENERATOR="Unix Makefiles"
|
||||
|
@ -66,8 +66,8 @@ case $wxTOOLSET in
|
||||
pushd tests && ./test && popd
|
||||
echo -en 'travis_fold:end:script.testing\\r'
|
||||
|
||||
if [ "$(uname -s)" = "Linux" ]; then
|
||||
echo 'Testing GUI...' && echo -en 'travis_fold:start:script.testing_gui\\r'
|
||||
if [ "$wxUSE_XVFB" = 1 ]; then
|
||||
echo 'Testing GUI using Xvfb...' && echo -en 'travis_fold:start:script.testing_gui\\r'
|
||||
pushd tests && xvfb-run -a ./test_gui && popd
|
||||
echo -en 'travis_fold:end:script.testing_gui\\r'
|
||||
fi
|
||||
|
Loading…
Reference in New Issue
Block a user