diff options
author | Hisham Muhammad <hisham@gobolinux.org> | 2016-08-22 17:26:31 -0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-08-22 17:26:31 -0300 |
commit | aea914fd62e73e3106b57f36427ad36123a515a0 (patch) | |
tree | 991ad55f79c0fd267eee12b3b2b8c366f2705e68 /spec/install_spec.lua | |
parent | 043c656a11140df8411f0635dc9b79700040d37d (diff) | |
parent | 6d9c9997645c07ed93719d85e260d9ffbc2d1d25 (diff) | |
download | luarocks-aea914fd62e73e3106b57f36427ad36123a515a0.tar.gz luarocks-aea914fd62e73e3106b57f36427ad36123a515a0.tar.bz2 luarocks-aea914fd62e73e3106b57f36427ad36123a515a0.zip |
Merge pull request #607 from robooo/new-tests
Improvement of checking openssl libs on appveyor
Diffstat (limited to 'spec/install_spec.lua')
-rw-r--r-- | spec/install_spec.lua | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/spec/install_spec.lua b/spec/install_spec.lua index 2b6cb77f..e5b9e2cc 100644 --- a/spec/install_spec.lua +++ b/spec/install_spec.lua | |||
@@ -66,22 +66,14 @@ describe("LuaRocks install tests #blackbox #b_install", function() | |||
66 | end) | 66 | end) |
67 | 67 | ||
68 | it("LuaRocks install luasec and show luasocket (dependency)", function() | 68 | it("LuaRocks install luasec and show luasocket (dependency)", function() |
69 | if test_env.APPVEYOR then | 69 | assert.is_true(run.luarocks_bool(test_env.quiet("install luasec " .. test_env.OPENSSL_DIRS))) |
70 | assert.is_true(run.luarocks_bool(test_env.quiet("install luasec " .. test_env.APPVEYOR_OPENSSL))) | ||
71 | else | ||
72 | assert.is_true(run.luarocks_bool(test_env.quiet("install luasec"))) | ||
73 | end | ||
74 | assert.is_true(run.luarocks_bool("show luasocket")) | 70 | assert.is_true(run.luarocks_bool("show luasocket")) |
75 | end) | 71 | end) |
76 | end) | 72 | end) |
77 | 73 | ||
78 | describe("LuaRocks install - more complex tests", function() | 74 | describe("LuaRocks install - more complex tests", function() |
79 | it('LuaRocks install luasec with skipping dependency checks', function() | 75 | it('LuaRocks install luasec with skipping dependency checks', function() |
80 | if test_env.APPVEYOR then | 76 | assert.is_true(run.luarocks_bool(test_env.quiet("install luasec " .. test_env.OPENSSL_DIRS .. " --nodeps"))) |
81 | assert.is_true(run.luarocks_bool(test_env.quiet("install luasec " .. test_env.APPVEYOR_OPENSSL .. " --nodeps"))) | ||
82 | else | ||
83 | assert.is_true(run.luarocks_bool(test_env.quiet("install luasec --nodeps"))) | ||
84 | end | ||
85 | assert.is_true(run.luarocks_bool(test_env.quiet("show luasec"))) | 77 | assert.is_true(run.luarocks_bool(test_env.quiet("show luasec"))) |
86 | if env_variables.TYPE_TEST_ENV == "minimal" then | 78 | if env_variables.TYPE_TEST_ENV == "minimal" then |
87 | assert.is_false(run.luarocks_bool(test_env.quiet("show luasocket"))) | 79 | assert.is_false(run.luarocks_bool(test_env.quiet("show luasocket"))) |