From 15ad97bb124c800a95ac0d2d46f747e711fd3f8e Mon Sep 17 00:00:00 2001 From: Ignacio BurgueƱo Date: Tue, 14 Apr 2015 13:06:09 -0300 Subject: Address issues spotted in the review --- src/luarocks/install.lua | 2 +- test/testing.lua | 8 ++++---- test/testing.sh | 1 - 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) if err then return nil, err, errcode end util.printout() - util.printout("Succesfully nstalling dependencies for " ..name.." "..version) + util.printout("Succesfully installed dependencies for " ..name.." "..version) return name, version end 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 = { test_build_only_deps_rockspec = function() return run "$luarocks download --rockspec lxsh ${verrev_lxsh}" and run "$luarocks build ./lxsh-${verrev_lxsh}.rockspec --only-deps" - and run "$luarocks show lxsh; [ $? -ne 0 ]; };" + and (not run "$luarocks show lxsh") end, test_build_only_deps_src_rock = function() return run "$luarocks download --source lxsh ${verrev_lxsh}" and run "$luarocks build ./lxsh-${verrev_lxsh}.src.rock --only-deps" - and run "$luarocks show lxsh; [ $? -ne 0 ]; };" + and (not run "$luarocks show lxsh") end, - test_build_only_deps = function() return run "$luarocks build luasec --only-deps" and run "$luarocks show luasec; [ $? -ne 0 ]; };" end, - test_install_only_deps = function() return run "$luarocks install lxsh ${verrev_lxsh} --only-deps" and run "$luarocks show lxsh; [ $? -ne 0 ]; };" end, + test_build_only_deps = function() return run "$luarocks build luasec --only-deps" and (not run "$luarocks show luasec") end, + test_install_only_deps = function() return run "$luarocks install lxsh ${verrev_lxsh} --only-deps" and (not run "$luarocks show lxsh") end, fail_build_missing_external = function() return run '$luarocks build "$testing_dir/testfiles/missing_external-0.1-1.rockspec" INEXISTENT_INCDIR="/invalid/dir"' end, fail_build_invalidpatch = function() 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" get "$luarocks_repo/lua-path-0.2.3-1.src.rock" get "$luarocks_repo/lua-cjson-2.1.0-1.src.rock" get "$luarocks_repo/luacov-coveralls-0.1.1-1.src.rock" - get "$luarocks_repo/luacov-coveralls-0.1.1-1.src.rock" ) $luarocks_admin_nocov make_manifest "$testing_server" -- cgit v1.2.3-55-g6feb