diff options
| author | roboo <robo.karasek@gmail.com> | 2016-10-10 17:18:41 +0200 |
|---|---|---|
| committer | roboo <robo.karasek@gmail.com> | 2016-10-10 17:18:41 +0200 |
| commit | 407c010d4b1b5b22164b2b91fe4af9bda078c35d (patch) | |
| tree | 5589dbf6ee6c3cf48ebcd9b719f7d76507612362 | |
| parent | 9f2d580c6c01f058f10b07d9c891aa25f52fd93b (diff) | |
| download | luarocks-407c010d4b1b5b22164b2b91fe4af9bda078c35d.tar.gz luarocks-407c010d4b1b5b22164b2b91fe4af9bda078c35d.tar.bz2 luarocks-407c010d4b1b5b22164b2b91fe4af9bda078c35d.zip | |
Fix of openssl location on TravisCI OSX build
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | test/test_environment.lua | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 9a1b6745..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; gem install bundler; brew install openssl; brew link openssl --force;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 8f451e31..87401a90 100644 --- a/test/test_environment.lua +++ b/test/test_environment.lua | |||
| @@ -203,7 +203,7 @@ function test_env.set_args() | |||
| 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 | 205 | if test_env.TRAVIS then |
| 206 | test_env.OPENSSL_DIRS = "OPENSSL_LIBDIR=C:\\OpenSSL-Win32\\lib OPENSSL_INCDIR=C:\\OpenSSL-Win32\\include" | 206 | test_env.OPENSSL_DIRS = "OPENSSL_LIBDIR=/usr/local/opt/openssl/lib OPENSSL_INCDIR=/usr/local/opt/openssl/include" |
| 207 | end | 207 | end |
| 208 | elseif execute_output("uname -s") == "Linux" then | 208 | elseif execute_output("uname -s") == "Linux" then |
| 209 | test_env.TEST_TARGET_OS = "linux" | 209 | test_env.TEST_TARGET_OS = "linux" |