aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgnacio Burgueño <ignaciob@inconcertcc.com>2015-04-14 13:06:09 -0300
committerIgnacio Burgueño <ignaciob@inconcertcc.com>2015-04-14 13:06:09 -0300
commit15ad97bb124c800a95ac0d2d46f747e711fd3f8e (patch)
tree99aa590758f72f1e99b3f6d002c78f19800ff4d3
parent6b350de4daaccba8b142c5db0d8fb8fabaa1649b (diff)
downloadluarocks-15ad97bb124c800a95ac0d2d46f747e711fd3f8e.tar.gz
luarocks-15ad97bb124c800a95ac0d2d46f747e711fd3f8e.tar.bz2
luarocks-15ad97bb124c800a95ac0d2d46f747e711fd3f8e.zip
Address issues spotted in the review
-rw-r--r--src/luarocks/install.lua2
-rw-r--r--test/testing.lua8
-rwxr-xr-xtest/testing.sh1
3 files changed, 5 insertions, 6 deletions
diff --git a/src/luarocks/install.lua b/src/luarocks/install.lua
index 415186ba..6d457fc2 100644
--- a/src/luarocks/install.lua
+++ b/src/luarocks/install.lua
@@ -143,7 +143,7 @@ function install.install_binary_rock_deps(rock_file, deps_mode)
143 if err then return nil, err, errcode end 143 if err then return nil, err, errcode end
144 144
145 util.printout() 145 util.printout()
146 util.printout("Succesfully nstalling dependencies for " ..name.." "..version) 146 util.printout("Succesfully installed dependencies for " ..name.." "..version)
147 147
148 return name, version 148 return name, version
149end 149end
diff --git a/test/testing.lua b/test/testing.lua
index 45ee941a..86f3ab34 100644
--- a/test/testing.lua
+++ b/test/testing.lua
@@ -143,15 +143,15 @@ local tests = {
143 test_build_only_deps_rockspec = function() 143 test_build_only_deps_rockspec = function()
144 return run "$luarocks download --rockspec lxsh ${verrev_lxsh}" 144 return run "$luarocks download --rockspec lxsh ${verrev_lxsh}"
145 and run "$luarocks build ./lxsh-${verrev_lxsh}.rockspec --only-deps" 145 and run "$luarocks build ./lxsh-${verrev_lxsh}.rockspec --only-deps"
146 and run "$luarocks show lxsh; [ $? -ne 0 ]; };" 146 and (not run "$luarocks show lxsh")
147 end, 147 end,
148 test_build_only_deps_src_rock = function() 148 test_build_only_deps_src_rock = function()
149 return run "$luarocks download --source lxsh ${verrev_lxsh}" 149 return run "$luarocks download --source lxsh ${verrev_lxsh}"
150 and run "$luarocks build ./lxsh-${verrev_lxsh}.src.rock --only-deps" 150 and run "$luarocks build ./lxsh-${verrev_lxsh}.src.rock --only-deps"
151 and run "$luarocks show lxsh; [ $? -ne 0 ]; };" 151 and (not run "$luarocks show lxsh")
152 end, 152 end,
153 test_build_only_deps = function() return run "$luarocks build luasec --only-deps" and run "$luarocks show luasec; [ $? -ne 0 ]; };" end, 153 test_build_only_deps = function() return run "$luarocks build luasec --only-deps" and (not run "$luarocks show luasec") end,
154 test_install_only_deps = function() return run "$luarocks install lxsh ${verrev_lxsh} --only-deps" and run "$luarocks show lxsh; [ $? -ne 0 ]; };" end, 154 test_install_only_deps = function() return run "$luarocks install lxsh ${verrev_lxsh} --only-deps" and (not run "$luarocks show lxsh") end,
155 fail_build_missing_external = function() return run '$luarocks build "$testing_dir/testfiles/missing_external-0.1-1.rockspec" INEXISTENT_INCDIR="/invalid/dir"' end, 155 fail_build_missing_external = function() return run '$luarocks build "$testing_dir/testfiles/missing_external-0.1-1.rockspec" INEXISTENT_INCDIR="/invalid/dir"' end,
156 fail_build_invalidpatch = function() 156 fail_build_invalidpatch = function()
157 need_luasocket() 157 need_luasocket()
diff --git a/test/testing.sh b/test/testing.sh
index 7f0a4ae0..0fa6fe92 100755
--- a/test/testing.sh
+++ b/test/testing.sh
@@ -263,7 +263,6 @@ mkdir -p "$testing_server"
263 get "$luarocks_repo/lua-path-0.2.3-1.src.rock" 263 get "$luarocks_repo/lua-path-0.2.3-1.src.rock"
264 get "$luarocks_repo/lua-cjson-2.1.0-1.src.rock" 264 get "$luarocks_repo/lua-cjson-2.1.0-1.src.rock"
265 get "$luarocks_repo/luacov-coveralls-0.1.1-1.src.rock" 265 get "$luarocks_repo/luacov-coveralls-0.1.1-1.src.rock"
266 get "$luarocks_repo/luacov-coveralls-0.1.1-1.src.rock"
267) 266)
268$luarocks_admin_nocov make_manifest "$testing_server" 267$luarocks_admin_nocov make_manifest "$testing_server"
269 268