From 56c97a9b827b5895cb9567e8b2a9f651efa8104f Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Sun, 23 Apr 2017 19:43:46 -0700 Subject: [PATCH] Linux only unit testings --- .travis.yml | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6143805cf..fbdd22080 100644 --- a/.travis.yml +++ b/.travis.yml @@ -173,15 +173,10 @@ script: fi #- ccache -s - # unit tests linux/osx - - if [ "${TRAVIS_BRANCH}" != "master" ]; then - if [[ "${SPEC}" = "linux-g++-64" && "${CONFIG}" = "debug" ]]; then - mkdir -p ~/.config/QtProject/ && cp ${TRAVIS_BUILD_DIR}/test/qtlogging.ini ~/.config/QtProject/ && + # unit tests linux + - if [[ "${SPEC}" = "linux-g++-64" && "${CONFIG}" = "debug" ]]; then + mkdir -p ~/.config/QtProject/ && cp ${TRAVIS_BUILD_DIR}/test/qtlogging.ini ~/.config/QtProject/ && ./debug/qgroundcontrol-start.sh --unittest; - elif [[ "${SPEC}" = "macx-clang" && "${CONFIG}" = "debug" ]]; then - mkdir -p ~/Library/Preferences/QtProject/ && cp ${TRAVIS_BUILD_DIR}/test/qtlogging.ini ~/Library/Preferences/QtProject/ && - ./debug/qgroundcontrol.app/Contents/MacOS/QGroundControl --unittest; - fi fi after_success: -- 2.22.0