aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--spec/build_spec.lua2
-rw-r--r--spec/test_spec.lua17
2 files changed, 1 insertions, 18 deletions
diff --git a/spec/build_spec.lua b/spec/build_spec.lua
index 08a9c93f..3b5185e1 100644
--- a/spec/build_spec.lua
+++ b/spec/build_spec.lua
@@ -21,8 +21,6 @@ local extra_rocks = {
21 "/luasocket-${LUASOCKET}.src.rock", 21 "/luasocket-${LUASOCKET}.src.rock",
22 "/luasocket-${LUASOCKET}.rockspec", 22 "/luasocket-${LUASOCKET}.rockspec",
23 "spec/fixtures/a_rock-1.0-1.src.rock", 23 "spec/fixtures/a_rock-1.0-1.src.rock",
24 "/busted-2.0.0-1.rockspec",
25 "/busted-2.0.rc13-0.rockspec",
26} 24}
27 25
28local c_module_source = [[ 26local c_module_source = [[
diff --git a/spec/test_spec.lua b/spec/test_spec.lua
index 194dcfd1..6d546522 100644
--- a/spec/test_spec.lua
+++ b/spec/test_spec.lua
@@ -19,7 +19,7 @@ local extra_rocks = {
19 19
20describe("luarocks test #integration", function() 20describe("luarocks test #integration", function()
21 21
22 before_each(function() 22 lazy_setup(function()
23 test_env.setup_specs(extra_rocks) 23 test_env.setup_specs(extra_rocks)
24 end) 24 end)
25 25
@@ -35,21 +35,6 @@ describe("luarocks test #integration", function()
35 35
36 describe("busted backend", function() 36 describe("busted backend", function()
37 37
38 lazy_setup(function()
39 -- Try to cache rocks from the host system to speed up test
40 for _, r in ipairs(extra_rocks) do
41 r = test_env.V(r)
42 local n, v = r:match("^/(.*)%-([^%-]+)%-%d+%.[^%-]+$")
43 os.execute("luarocks pack " .. n .. " " .. v)
44 end
45 if test_env.TEST_TARGET_OS == "windows" then
46 os.execute("move *.rock " .. testing_paths.testing_server)
47 else
48 os.execute("mv *.rock " .. testing_paths.testing_server)
49 end
50 test_env.run.luarocks_admin_nocov("make_manifest " .. testing_paths.testing_server)
51 end)
52
53 it("with rockspec, installing busted", function() 38 it("with rockspec, installing busted", function()
54 finally(function() 39 finally(function()
55 -- delete downloaded and unpacked files 40 -- delete downloaded and unpacked files