Thanks to visit codestin.com
Credit goes to github.com

Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
mbedtls: Fix travis build
  • Loading branch information
joshtriplett committed Sep 25, 2016
commit dab8d43de7edf2b93f573a48c888ab2678a02497
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,12 @@ matrix:
- compiler: gcc
env:
- MBEDTLS=1
OPTIONS="-DTHREADSAFE=ON -DCMAKE_BUILD_TYPE=Release -DUSE_OPENSSL=OFF -DMBEDTLS_ROOT_DIR=../mbedtls"
OPTIONS="-DTHREADSAFE=ON -DCMAKE_BUILD_TYPE=Release -DUSE_OPENSSL=OFF -DUSE_MBEDTLS=ON"
os: linux
- compiler: gcc
env:
- MBEDTLS=1
OPTIONS="-DTHREADSAFE=OFF -DBUILD_EXAMPLES=ON -DUSE_OPENSSL=OFF -DMBEDTLS_ROOT_DIR=../mbedtls"
OPTIONS="-DTHREADSAFE=OFF -DBUILD_EXAMPLES=ON -DUSE_OPENSSL=OFF -DUSE_MBEDTLS=ON"
os: linux
allow_failures:
- env: COVERITY=1
Expand Down
3 changes: 3 additions & 0 deletions script/cibuild.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ java -jar poxyproxy.jar -d --port 8080 --credentials foo:bar &
if [ -n "$MBEDTLS" ];
then
./script/mbedtls.sh;
CMAKE_INCLUDE_PATH=../mbedtls/include
CMAKE_LIBRARY_PATH=../mbedtls/library
export CMAKE_INCLUDE_PATH CMAKE_LIBRARY_PATH
fi
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be part of the script that installs the dependencies. The Travis rules currently only do it for osx, but we should remove the if there and run it for linux too. The instructions for installing mbedtls should go there.


mkdir _build
Expand Down