diff options
| author | Davide Beatrici <davidebeatrici@gmail.com> | 2017-03-06 02:00:15 +0300 |
|---|---|---|
| committer | Davide Beatrici <davidebeatrici@gmail.com> | 2017-03-17 21:14:13 +0300 |
| commit | 2bd9f06651ea1ef1e579141efe0d321ed741e18f (patch) | |
| tree | a377bb707801aa7d692c025b8cb3d82662277e1b /scripts/travis-ci | |
| parent | f9cf8da5b8833f6a71126deebaaa8da9a36e78a0 (diff) | |
travis-ci: Execute "make check" using Wine
Diffstat (limited to 'scripts/travis-ci')
| -rwxr-xr-x | scripts/travis-ci/before_install.bash | 3 | ||||
| -rwxr-xr-x | scripts/travis-ci/script.bash | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/scripts/travis-ci/before_install.bash b/scripts/travis-ci/before_install.bash index 9159dfb4a..5df2bfe43 100755 --- a/scripts/travis-ci/before_install.bash +++ b/scripts/travis-ci/before_install.bash @@ -22,6 +22,7 @@ if [ "${TRAVIS_OS_NAME}" == "linux" ]; then sudo apt-key adv --keyserver x-hkp://keys.gnupg.net --recv-keys D43A795B73B16ABE9643FE1AFD8FFF16DB45C6AB sudo apt-get -qq update sudo apt-get install \ + wine \ mxe-${MUMBLE_HOST_DEB}.static-qtbase \ mxe-${MUMBLE_HOST_DEB}.static-qtsvg \ mxe-${MUMBLE_HOST_DEB}.static-qttools \ @@ -34,11 +35,13 @@ if [ "${TRAVIS_OS_NAME}" == "linux" ]; then mxe-${MUMBLE_HOST_DEB}.static-vorbis \ mxe-${MUMBLE_HOST_DEB}.static-libsndfile elif [ "${MUMBLE_QT}" == "qt5" ] && [ "${MUMBLE_HOST}" == "x86_64-w64-mingw32" ]; then + sudo dpkg --add-architecture i386 sudo apt-get -qq update echo "deb http://pkg.mxe.cc/repos/apt/debian jessie main" | sudo tee /etc/apt/sources.list.d/mxeapt.list sudo apt-key adv --keyserver x-hkp://keys.gnupg.net --recv-keys D43A795B73B16ABE9643FE1AFD8FFF16DB45C6AB sudo apt-get -qq update sudo apt-get install \ + wine \ mxe-${MUMBLE_HOST_DEB}.static-qtbase \ mxe-${MUMBLE_HOST_DEB}.static-qtsvg \ mxe-${MUMBLE_HOST_DEB}.static-qttools \ diff --git a/scripts/travis-ci/script.bash b/scripts/travis-ci/script.bash index 71bc27cd6..34fe4b6fb 100755 --- a/scripts/travis-ci/script.bash +++ b/scripts/travis-ci/script.bash @@ -18,7 +18,7 @@ if [ "${TRAVIS_OS_NAME}" == "linux" ]; then export MUMBLE_PROTOC=/usr/lib/mxe/usr/x86_64-unknown-linux-gnu/bin/protoc ${MUMBLE_HOST}.static-qmake-qt5 -recursive -Wall CONFIG+="release tests warnings-as-errors winpaths_custom g15-emulator no-overlay no-bonjour no-elevation no-ice" make -j2 - make check + make check TESTRUNNER="wine" elif [ "${MUMBLE_QT}" == "qt5" ] && [ "${MUMBLE_HOST}" == "x86_64-w64-mingw32" ]; then wget http://www.steinberg.net/sdk_downloads/asiosdk2.3.zip -P ../ unzip ../asiosdk2.3.zip -d ../ @@ -27,7 +27,7 @@ if [ "${TRAVIS_OS_NAME}" == "linux" ]; then export MUMBLE_PROTOC=/usr/lib/mxe/usr/x86_64-unknown-linux-gnu/bin/protoc ${MUMBLE_HOST}.static-qmake-qt5 -recursive -Wall CONFIG+="release tests warnings-as-errors winpaths_custom g15-emulator no-overlay no-bonjour no-elevation no-ice" make -j2 - make check + make check TESTRUNNER="wine" else exit 1 fi |