Merge remote-tracking branch 'refs/remotes/cose-wg/master'
diff --git a/.travis.yml b/.travis.yml
index 62078ce..5519c20 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,20 +7,13 @@
- pip install cpp-coveralls --user
- export LD_LIBRARY_PATH=$PWD/build/dist/lib:$LD_LIBRARY_PATH
env:
- - USE_CONTEXT=ON COVERALL_SEND=OFF
- - USE_CONTEXT=ON COVERALL_SEND=ON
- - USE_CONTEXT=OFF COVERALL_SEND=ON
- - USE_CONTEXT=OFF USE_EMBEDTLS=ON COVERALL_SEND=ON
+ - USE_CONTEXT=ON
+ - USE_CONTEXT=OFF
+ - USE_CONTEXT=OFF USE_EMBEDTLS=ON
matrix:
exclude:
- - compiler: gcc
- env: USE_CONTEXT=ON COVERALL_SEND=OFF
- compiler: clang-3.8
- env: USE_CONTEXT=OFF USE_EMBEDTLS=ON COVERALL_SEND=ON
- - compiler: clang-3.8
- env: USE_CONTEXT=ON COVERALL_SEND=ON
- - compiler: clang-3.8
- env: USE_CONTEXT=OFF COVERALL_SEND=ON
+ env: USE_CONTEXT=OFF
addons:
apt:
@@ -37,7 +30,7 @@
- cmake --version
- git clone --depth 1 git://github.com/cose-wg/Examples Examples
- mkdir build
- - cd build && cmake -Duse_context=$USE_CONTEXT -Dcoveralls=$COVERALL_SEND -Dcoveralls_send=$COVERALL_SEND -Duse_embedtls=$USE_EMBEDTLS .. && make all test
+ - cd build && cmake -Duse_context=$USE_CONTEXT -Dcoveralls_send=ON -Duse_embedtls=$USE_EMBEDTLS .. && make all test
after_success:
- make coveralls
