diff options
| author | Mikkel Krautz <mikkel@krautz.dk> | 2018-01-20 17:35:30 +0300 |
|---|---|---|
| committer | Mikkel Krautz <mikkel@krautz.dk> | 2018-01-20 17:35:30 +0300 |
| commit | 6a1663a502c6fb3022ea835d9c094e8ee72b94e8 (patch) | |
| tree | ec34201cd0b6c6fcd679a6a18f0916ecb428373e /scripts/travis-ci | |
| parent | a189969521081565b8bda93d253670370778d471 (diff) | |
scripts/travis-ci: fix MUMBLE_NO_PCH checks in script.bash.
Change our checks for MUMBLE_NO_PCH to use string comparisons
instead of numerical comparisons.
When MUMBLE_NO_PCH is not set, the numerical equivalent check
fails because nothing is on the left-hand side of the -eq operator.
Fixes mumble-voip/mumble#3314
Diffstat (limited to 'scripts/travis-ci')
| -rwxr-xr-x | scripts/travis-ci/script.bash | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/travis-ci/script.bash b/scripts/travis-ci/script.bash index 142c821bc..838f215b2 100755 --- a/scripts/travis-ci/script.bash +++ b/scripts/travis-ci/script.bash @@ -8,13 +8,13 @@ if [ "${TRAVIS_OS_NAME}" == "linux" ]; then if [ "${MUMBLE_QT}" == "qt4" ] && [ "${MUMBLE_HOST}" == "x86_64-linux-gnu" ]; then EXTRA_CONFIG= - if [ ${MUMBLE_NO_PCH} -eq 1 ]; then + if [ "${MUMBLE_NO_PCH}" == "1" ]; then EXTRA_CONFIG="no-pch ${EXTRA_CONFIG}" fi qmake-qt4 CONFIG+="release tests g15-emulator qt4-legacy-compat ${EXTRA_CONFIG}" -recursive && make -j2 && make check elif [ "${MUMBLE_QT}" == "qt5" ] && [ "${MUMBLE_HOST}" == "x86_64-linux-gnu" ]; then EXTRA_CONFIG= - if [ ${MUMBLE_NO_PCH} -eq 1 ]; then + if [ "${MUMBLE_NO_PCH}" == "1" ]; then EXTRA_CONFIG="no-pch ${EXTRA_CONFIG}" fi qmake CONFIG+="release tests g15-emulator ${EXTRA_CONFIG}" -recursive && make -j2 && make check @@ -25,7 +25,7 @@ if [ "${TRAVIS_OS_NAME}" == "linux" ]; then PATH=$PATH:/usr/lib/mxe/usr/bin export MUMBLE_PROTOC=/usr/lib/mxe/usr/x86_64-unknown-linux-gnu/bin/protoc EXTRA_CONFIG= - if [ ${MUMBLE_NO_PCH} -eq 1 ]; then + if [ "${MUMBLE_NO_PCH}" == "1" ]; then EXTRA_CONFIG="no-pch ${EXTRA_CONFIG}" fi ${MUMBLE_HOST}.static-qmake-qt5 -recursive -Wall CONFIG+="release tests warnings-as-errors g15-emulator no-overlay no-bonjour no-elevation no-ice ${EXTRA_CONFIG}" @@ -38,7 +38,7 @@ if [ "${TRAVIS_OS_NAME}" == "linux" ]; then PATH=$PATH:/usr/lib/mxe/usr/bin export MUMBLE_PROTOC=/usr/lib/mxe/usr/x86_64-unknown-linux-gnu/bin/protoc EXTRA_CONFIG= - if [ ${MUMBLE_NO_PCH} -eq 1 ]; then + if [ "${MUMBLE_NO_PCH}" == "1" ]; then EXTRA_CONFIG="no-pch ${EXTRA_CONFIG}" fi ${MUMBLE_HOST}.static-qmake-qt5 -recursive -Wall CONFIG+="release tests warnings-as-errors g15-emulator no-overlay no-bonjour no-elevation no-ice ${EXTRA_CONFIG}" |