Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 10:46:35 +01:00
Code Releases Activity

[Travis] Use PPA for Qt 5 + Allow run_scripts.sh to use specified qmake

Browse Source
This commit is contained in:
nowrep 2014-02-04 12:21:23 +01:00
parent 0035e359fb
commit 0457cd592a
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.travis.yml
View File

@ -12,10 +12,10 @@ install:
- sudo apt-get -qq update - sudo apt-get -qq update
- sudo apt-get -qq install libssl-dev pkg-config libhunspell-dev - sudo apt-get -qq install libssl-dev pkg-config libhunspell-dev
- if [[ "$QT" == "qt4" ]]; then sudo apt-get -qq install libqt4-dev libqt4-webkit libqt4-sql-sqlite; fi - if [[ "$QT" == "qt4" ]]; then sudo apt-get -qq install libqt4-dev libqt4-webkit libqt4-sql-sqlite; fi
- if [[ "$QT" == "qt5" ]]; then sudo apt-get -qq install libqt5-dev; fi - if [[ "$QT" == "qt5" ]]; then sudo apt-add-repository -y ppa:beineri/opt-qt511; sudo apt-get update -qq; sudo apt-get install -qq qt51base qt51webkit qt51tools; fi
script: script:
- if [[ "$QT" == "qt5" ]]; then alias qmake=`qtchooser -qt=qt5 -run-tool=qmake --help | head -n1 | cut -d" " -f2`; fi - QMAKE="qmake"
- qmake - if [[ "$QT" == "qt5" ]]; then QMAKE="/opt/qt51/bin/qmake"; fi
- make - $QMAKE
- cd scripts && source run_tests.sh - cd scripts && ./run_tests.sh $QMAKE

8
scripts/run_tests.sh
View File

@ -1,8 +1,14 @@
#!/bin/bash #!/bin/bash
# run_tests.sh # run_tests.sh
QMAKE="qmake"
if [ -n "$1" ]; then
QMAKE=$1
fi
cd ../tests/autotests cd ../tests/autotests
(qmake DEFINES+=NO_SYSTEM_DATAPATH && make) || exit 1 ($QMAKE DEFINES+=NO_SYSTEM_DATAPATH && make) || exit 1
cd ../../bin cd ../../bin
./autotests ./autotests