From 45c7334b90bfea01b0ddd452545134292b9e3ebb Mon Sep 17 00:00:00 2001 From: roboo Date: Mon, 10 Oct 2016 17:00:02 +0200 Subject: Fix of openssl location on TravisCI OSX build --- test/test_environment.lua | 3 +++ 1 file changed, 3 insertions(+) (limited to 'test') diff --git a/test/test_environment.lua b/test/test_environment.lua index 8239795d..8f451e31 100644 --- a/test/test_environment.lua +++ b/test/test_environment.lua @@ -202,6 +202,9 @@ function test_env.set_args() if execute_bool("sw_vers") then test_env.TEST_TARGET_OS = "osx" + if test_env.TRAVIS then + test_env.OPENSSL_DIRS = "OPENSSL_LIBDIR=C:\\OpenSSL-Win32\\lib OPENSSL_INCDIR=C:\\OpenSSL-Win32\\include" + end elseif execute_output("uname -s") == "Linux" then test_env.TEST_TARGET_OS = "linux" else -- cgit v1.2.3-55-g6feb From 407c010d4b1b5b22164b2b91fe4af9bda078c35d Mon Sep 17 00:00:00 2001 From: roboo Date: Mon, 10 Oct 2016 17:18:41 +0200 Subject: Fix of openssl location on TravisCI OSX build --- .travis.yml | 2 +- test/test_environment.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'test') diff --git a/.travis.yml b/.travis.yml index 9a1b6745..ff2fb661 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,7 +40,7 @@ matrix: before_install: - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; brew install python; gem install bundler; brew install openssl; brew link openssl --force;fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update;fi - pip install hererocks - hererocks lua_install -r^ --$LUA - export PATH=$PATH:$PWD/lua_install/bin # Add directory with all installed binaries to PATH diff --git a/test/test_environment.lua b/test/test_environment.lua index 8f451e31..87401a90 100644 --- a/test/test_environment.lua +++ b/test/test_environment.lua @@ -203,7 +203,7 @@ function test_env.set_args() if execute_bool("sw_vers") then test_env.TEST_TARGET_OS = "osx" if test_env.TRAVIS then - test_env.OPENSSL_DIRS = "OPENSSL_LIBDIR=C:\\OpenSSL-Win32\\lib OPENSSL_INCDIR=C:\\OpenSSL-Win32\\include" + test_env.OPENSSL_DIRS = "OPENSSL_LIBDIR=/usr/local/opt/openssl/lib OPENSSL_INCDIR=/usr/local/opt/openssl/include" end elseif execute_output("uname -s") == "Linux" then test_env.TEST_TARGET_OS = "linux" -- cgit v1.2.3-55-g6feb