Only run unit tests on pull requests

5c94cda4 · Don Gagne · Lorenz Meier · ca28b596 · 5c94cda4
Commit 5c94cda4 authored Oct 20, 2016 by Don Gagne Committed by Lorenz Meier Oct 23, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 6 deletions

.travis.yml .travis.yml +8 -6

No files found.
--- a/.travis.yml
+++ b/.travis.yml
@@ -174,12 +174,14 @@ script:
  #- ccache -s
  # unit tests linux/osx
-  - if [[ "${SPEC}" = "linux-g++-64" && "${CONFIG}" = "debug" ]]; then
+  - if [ "${TRAVIS_BRANCH}" != "master" ]; then
-        mkdir -p ~/.config/QtProject/ && cp ${TRAVIS_BUILD_DIR}/test/qtlogging.ini ~/.config/QtProject/ &&
+        if [[ "${SPEC}" = "linux-g++-64" && "${CONFIG}" = "debug" ]]; then
-        ./debug/QGroundControl --unittest;
+            mkdir -p ~/.config/QtProject/ && cp ${TRAVIS_BUILD_DIR}/test/qtlogging.ini ~/.config/QtProject/ &&
-    elif [[ "${SPEC}" = "macx-clang" && "${CONFIG}" = "debug" ]]; then
+            ./debug/QGroundControl --unittest;
-        mkdir -p ~/Library/Preferences/QtProject/ && cp ${TRAVIS_BUILD_DIR}/test/qtlogging.ini ~/Library/Preferences/QtProject/ &&
+        elif [[ "${SPEC}" = "macx-clang" && "${CONFIG}" = "debug" ]]; then
-        ./debug/qgroundcontrol.app/Contents/MacOS/QGroundControl --unittest;
+            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: