diff options
author | roboo <robo.karasek@gmail.com> | 2016-08-22 21:01:23 +0200 |
---|---|---|
committer | roboo <robo.karasek@gmail.com> | 2016-08-22 21:01:23 +0200 |
commit | 6d9c9997645c07ed93719d85e260d9ffbc2d1d25 (patch) | |
tree | 666475e30cf2afa35dc966fcfa45f37978eaee1c /spec/install_spec.lua | |
parent | 7225a3d4513137a8e13a5db39538e007b8faa886 (diff) | |
download | luarocks-6d9c9997645c07ed93719d85e260d9ffbc2d1d25.tar.gz luarocks-6d9c9997645c07ed93719d85e260d9ffbc2d1d25.tar.bz2 luarocks-6d9c9997645c07ed93719d85e260d9ffbc2d1d25.zip |
Change APPVEYOR_OPENSSL to OPENSSL_DIRS for better test readability
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"))) |