diff --git a/ci/travis/before_install.sh b/ci/travis/before_install.sh index ec0749f3d621d2728dcdebc809748d2d11bf4b89..9b240316f1baf0ea5a6e8d50eaf100050b6781cb 100755 --- a/ci/travis/before_install.sh +++ b/ci/travis/before_install.sh @@ -1,5 +1,14 @@ #!/usr/bin/env bash + +if [ $TRAVIS_OS_NAME == "linux" ] +then + export XVFBARGS="-screen 0 1280x1024x24" + export DISPLAY=:99.0 + sh -e /etc/init.d/xvfb start + sleep 3 +fi + if [ $TRAVIS_OS_NAME == "osx" ] then brew tap homebrew/versions @@ -69,6 +78,7 @@ then --enable QtWebKit \ --enable QtWebKitWidgets \ --enable QtNetwork \ + --enable QtPrintSupport \ --enable QtTest elif [ $TRAVIS_OS_NAME == "linux" ] then @@ -80,6 +90,7 @@ then --enable QtWebKit \ --enable QtWebKitWidgets \ --enable QtNetwork \ + --enable QtPrintSupport \ --enable QtTest fi diff --git a/ci/travis/test.sh b/ci/travis/test.sh index 1f772c1afb7d71ccc809900e9751e9b9625d6819..06a889459e3444e2f43fc73c26dbda29f160e621 100755 --- a/ci/travis/test.sh +++ b/ci/travis/test.sh @@ -5,14 +5,5 @@ eval "$(pyenv virtualenv-init -)" cd $HOME/build/ucoin-io/sakia pyenv activate sakia-env - -if [ $TRAVIS_OS_NAME == "linux" ] -then - export XVFBARGS="-screen 0 1280x1024x24" - export DISPLAY=:99.0 - sh -e /etc/init.d/xvfb start - sleep 3 -fi - coverage run --source=sakia.core,sakia.gui,sakia.models setup.py test