From a70e22a999cde94f788443c039079bacab291b60 Mon Sep 17 00:00:00 2001 From: Daniel Agar Date: Sat, 5 Sep 2015 23:21:08 -0400 Subject: [PATCH 1/4] re-enable travis-ci linux unittests --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index f234d8d..e9520a4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,12 +23,12 @@ cache: before_install: - cd ${TRAVIS_BUILD_DIR} && git fetch --unshallow && git fetch --tags - - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then mkdir -p $HOME/Library/Preferences/QtProject/ && cp ${TRAVIS_BUILD_DIR}/test/qtlogging.ini ~/Library/Preferences/QtProject/; fi + - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then mkdir -p ~/.config/QtProject/ && cp ${TRAVIS_BUILD_DIR}/test/qtlogging.ini ~/.config/QtProject/; fi + - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then mkdir -p ~/Library/Preferences/QtProject/ && cp ${TRAVIS_BUILD_DIR}/test/qtlogging.ini ~/Library/Preferences/QtProject/; fi install: - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then - mkdir -p $HOME/.config/QtProject $HOME/.config/QGroundControl.org $HOME/QGroundControl - && sudo apt-add-repository -y ppa:ubuntu-toolchain-r/test + sudo apt-add-repository -y ppa:ubuntu-toolchain-r/test && sudo apt-add-repository -y ppa:beineri/opt-qt541 && sudo apt-get -qq update && sudo apt-get -qq install g++-4.8 libc6-i386 qt54tools qt54base qt54declarative qt54serialport qt54svg qt54webkit qt54quickcontrols qt54xmlpatterns qt54x11extras qt54websockets qt54sensors qt54script qt54quick1 qt54multimedia qt54location qt54imageformats qt54graphicaleffects qt54connectivity espeak libespeak-dev libopenscenegraph-dev libsdl1.2-dev libudev-dev @@ -54,7 +54,7 @@ script: - make -j4 - echo -en 'travis_fold:end:script.1\\r' - echo 'Running unittests' && echo -en 'travis_fold:start:script.2\\r' -# - if [[ "${TRAVIS_OS_NAME}" = "linux" && "${CONFIG}" = "debug" ]]; then ls -ls ~; ls -ls ~/.config; ./debug/qgroundcontrol --unittest; fi + - if [[ "${TRAVIS_OS_NAME}" = "linux" && "${CONFIG}" = "debug" ]]; then ./debug/qgroundcontrol --unittest; fi - if [[ "${TRAVIS_OS_NAME}" = "osx" && "${CONFIG}" = "debug" ]]; then ./debug/qgroundcontrol.app/Contents/MacOS/qgroundcontrol --unittest; fi - echo -en 'travis_fold:end:script.2\\r' From 47d93de04b0b6c7be969cb76aaf3d5c553eed20b Mon Sep 17 00:00:00 2001 From: Daniel Agar Date: Sun, 6 Sep 2015 14:46:39 -0400 Subject: [PATCH 2/4] switch documentsDir.exists() assert to QWarning --- src/QGCApplication.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/QGCApplication.cc b/src/QGCApplication.cc index 7fb78ed..7ecc0e5 100644 --- a/src/QGCApplication.cc +++ b/src/QGCApplication.cc @@ -391,7 +391,9 @@ void QGCApplication::_initCommon(void) QString documentsLocation = QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation); QDir documentsDir(documentsLocation); - Q_ASSERT(documentsDir.exists()); + if (!documentsDir.exists()) { + qWarning() << "Documents directory doesn't exist" << documentsDir.absolutePath(); + } bool pathCreated = documentsDir.mkpath(_defaultSavedFileDirectoryName); Q_UNUSED(pathCreated); From 2d687443ff0968463f867ee4643c98835c9cc0cb Mon Sep 17 00:00:00 2001 From: Daniel Agar Date: Sun, 6 Sep 2015 16:16:12 -0400 Subject: [PATCH 3/4] qmake Linux installer create qgroundcontrol.tar.bz2 --- .travis.yml | 4 ++-- QGCInstaller.pri | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index e9520a4..aa65640 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,7 +27,7 @@ before_install: - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then mkdir -p ~/Library/Preferences/QtProject/ && cp ${TRAVIS_BUILD_DIR}/test/qtlogging.ini ~/Library/Preferences/QtProject/; fi install: - - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then + - if [[ "${TRAVIS_OS_NAME}" = "linux" || "${TRAVIS_OS_NAME}" = "android" ]]; then sudo apt-add-repository -y ppa:ubuntu-toolchain-r/test && sudo apt-add-repository -y ppa:beineri/opt-qt541 && sudo apt-get -qq update @@ -38,7 +38,7 @@ install: && export DISPLAY=:99.0 && sh -e /etc/init.d/xvfb start ; - else + elif [ "${TRAVIS_OS_NAME}" = "osx" ]; then brew tap PX4/homebrew-px4 && brew update && brew install qt54 diff --git a/QGCInstaller.pri b/QGCInstaller.pri index e529a62..581507f 100644 --- a/QGCInstaller.pri +++ b/QGCInstaller.pri @@ -50,4 +50,7 @@ installer { #QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY qgroundcontrol.pdb $${DESTDIR_WIN} #QMAKE_POST_LINK += $$escape_expand(\\n) del qgroundcontrol.pdb } + LinuxBuild { + QMAKE_POST_LINK += && tar -cjf qgroundcontrol.tar.bz2 release --transform 's/release/qgroundcontrol/' + } } From a0a7b7884ded8849d23ed9c84b339d98ac2a663a Mon Sep 17 00:00:00 2001 From: Daniel Agar Date: Mon, 7 Sep 2015 14:04:26 -0400 Subject: [PATCH 4/4] travis-ci linux switch to ppa:beineri/opt-qt542 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index aa65640..39611e0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,7 +29,7 @@ before_install: install: - if [[ "${TRAVIS_OS_NAME}" = "linux" || "${TRAVIS_OS_NAME}" = "android" ]]; then sudo apt-add-repository -y ppa:ubuntu-toolchain-r/test - && sudo apt-add-repository -y ppa:beineri/opt-qt541 + && sudo apt-add-repository -y ppa:beineri/opt-qt542 && sudo apt-get -qq update && sudo apt-get -qq install g++-4.8 libc6-i386 qt54tools qt54base qt54declarative qt54serialport qt54svg qt54webkit qt54quickcontrols qt54xmlpatterns qt54x11extras qt54websockets qt54sensors qt54script qt54quick1 qt54multimedia qt54location qt54imageformats qt54graphicaleffects qt54connectivity espeak libespeak-dev libopenscenegraph-dev libsdl1.2-dev libudev-dev && export PATH=/opt/qt54/bin:$PATH