Merge pull request #626 from robooo/new-tests

Fix of openssl location on TravisCI OSX build

2 files changed, 4 insertions, 1 deletions

diff --git a/.travis.yml b/.travis.yml
index 4962f290..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; 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 8239795d..87401a90 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=/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"
       else