diff options
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | test/test_environment.lua | 3 |
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: | |||
| 40 | 40 | ||
| 41 | 41 | ||
| 42 | before_install: | 42 | before_install: |
| 43 | - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; brew install python; fi | 43 | - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update;fi |
| 44 | - pip install hererocks | 44 | - pip install hererocks |
| 45 | - hererocks lua_install -r^ --$LUA | 45 | - hererocks lua_install -r^ --$LUA |
| 46 | - export PATH=$PATH:$PWD/lua_install/bin # Add directory with all installed binaries to PATH | 46 | - 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() | |||
| 202 | 202 | ||
| 203 | if execute_bool("sw_vers") then | 203 | if execute_bool("sw_vers") then |
| 204 | test_env.TEST_TARGET_OS = "osx" | 204 | test_env.TEST_TARGET_OS = "osx" |
| 205 | if test_env.TRAVIS then | ||
| 206 | test_env.OPENSSL_DIRS = "OPENSSL_LIBDIR=/usr/local/opt/openssl/lib OPENSSL_INCDIR=/usr/local/opt/openssl/include" | ||
| 207 | end | ||
| 205 | elseif execute_output("uname -s") == "Linux" then | 208 | elseif execute_output("uname -s") == "Linux" then |
| 206 | test_env.TEST_TARGET_OS = "linux" | 209 | test_env.TEST_TARGET_OS = "linux" |
| 207 | else | 210 | else |
