diff options
| author | Hisham Muhammad <hisham@gobolinux.org> | 2016-10-11 12:42:51 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-11 12:42:51 -0500 |
| commit | d0edbc1873ca9165d968752a67fabc4f580856df (patch) | |
| tree | 5589dbf6ee6c3cf48ebcd9b719f7d76507612362 /test/test_environment.lua | |
| parent | 1fea0e3a0972bcc6b4319cd3d9e79834562486bc (diff) | |
| parent | 407c010d4b1b5b22164b2b91fe4af9bda078c35d (diff) | |
| download | luarocks-d0edbc1873ca9165d968752a67fabc4f580856df.tar.gz luarocks-d0edbc1873ca9165d968752a67fabc4f580856df.tar.bz2 luarocks-d0edbc1873ca9165d968752a67fabc4f580856df.zip | |
Merge pull request #626 from robooo/new-tests
Fix of openssl location on TravisCI OSX build
Diffstat (limited to 'test/test_environment.lua')
| -rw-r--r-- | test/test_environment.lua | 3 |
1 files changed, 3 insertions, 0 deletions
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 |