diff options
| author | Daniel Schürmann <daschuer@mixxx.org> | 2018-05-02 00:25:06 +0200 |
|---|---|---|
| committer | Daniel Schürmann <daschuer@mixxx.org> | 2018-05-02 00:25:06 +0200 |
| commit | eb9edc4676d8e8184fa7c7bdef8d14c0bec0a19f (patch) | |
| tree | c8d0bcf9311705ddaa1a7d25aa8a7d287b8c4a7a /.travis.yml | |
| parent | 833e2ce7caac14073c32a251d02cadf7b585a4b2 (diff) | |
| parent | 8f1ad258aa9e042248dbd1a8bbc34b7563bad52f (diff) | |
Merge remote-tracking branch 'upstream/2.1'
Conflicts:
src/dialog/dlgabout.cpp
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 17c01e0261..0f4d12aaff 100644 --- a/.travis.yml +++ b/.travis.yml @@ -94,7 +94,9 @@ script: # return code in order to avoid having a successful build when a test fail. # https://bugs.launchpad.net/mixxx/+bug/1699689 - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ./mixxx-test ; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then lldb ./mixxx-test --batch -o run -o quit -k 'thread backtrace all' -k quit ; fi + # lldb doesn't provide an easy way to exit 1 on error: + # https://bugs.llvm.org/show_bug.cgi?id=27326 + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then lldb ./mixxx-test --batch -o run -o quit -k 'thread backtrace all' -k "script import os; os._exit(1)" ; fi notifications: webhooks: |