Linux only unit testings

56c97a9b · Don Gagne · 02d40245 · 56c97a9b
Commit 56c97a9b authored Apr 23, 2017 by Don Gagne
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 8 deletions

.travis.yml .travis.yml +3 -8

No files found.
--- 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: