tests: rockspec use cleanups

6 files changed, 5 insertions, 16 deletions

diff --git a/spec/add_spec.lua b/spec/add_spec.lua
index 0a345753..60eea86f 100644
--- a/spec/add_spec.lua
+++ b/spec/add_spec.lua
@@ -4,7 +4,6 @@ local testing_paths = test_env.testing_paths
 
 local extra_rocks = {
    "/luasocket-${LUASOCKET}.src.rock",
-   "/luasocket-${LUASOCKET}.rockspec"
 }
 
 describe("LuaRocks add tests #integration", function()
diff --git a/spec/build_spec.lua b/spec/build_spec.lua
index 3b5185e1..034c70d7 100644
--- a/spec/build_spec.lua
+++ b/spec/build_spec.lua
@@ -15,11 +15,9 @@ local extra_rocks = {
    "/lmathx-20120430.52-1.rockspec",
    "/lmathx-20150505-1.src.rock",
    "/lmathx-20150505-1.rockspec",
-   "/lpeg-1.0.0-1.rockspec",
    "/lpeg-1.0.0-1.src.rock",
    "/luafilesystem-${LUAFILESYSTEM}.src.rock",
    "/luasocket-${LUASOCKET}.src.rock",
-   "/luasocket-${LUASOCKET}.rockspec",
    "spec/fixtures/a_rock-1.0-1.src.rock",
 }
 
diff --git a/spec/deps_spec.lua b/spec/deps_spec.lua
index dd8fea64..766e0f04 100644
--- a/spec/deps_spec.lua
+++ b/spec/deps_spec.lua
@@ -5,9 +5,7 @@ local testing_paths = test_env.testing_paths
 
 local extra_rocks = {
    "/lxsh-${LXSH}.src.rock",
-   "/lxsh-${LXSH}.rockspec",
    "/luasocket-${LUASOCKET}.src.rock",
-   "/luasocket-${LUASOCKET}.rockspec",
    "/lpeg-${LPEG}.src.rock",
 }
 
diff --git a/spec/install_spec.lua b/spec/install_spec.lua
index ec42d125..df70ed23 100644
--- a/spec/install_spec.lua
+++ b/spec/install_spec.lua
@@ -9,13 +9,10 @@ local V = test_env.V
 
 local extra_rocks = {
    "/cprint-${CPRINT}.src.rock",
-   "/cprint-${CPRINT}.rockspec",
    "/lpeg-${LPEG}.src.rock",
    "/luassert-1.7.0-1.src.rock",
    "/luasocket-${LUASOCKET}.src.rock",
-   "/luasocket-${LUASOCKET}.rockspec",
    "/lxsh-${LXSH}.src.rock",
-   "/lxsh-${LXSH}.rockspec",
    "/say-1.2-1.src.rock",
    "/say-1.0-1.src.rock",
    "/luafilesystem-${LUAFILESYSTEM}.src.rock",
diff --git a/spec/test_spec.lua b/spec/test_spec.lua
index 6d546522..bc5f047e 100644
--- a/spec/test_spec.lua
+++ b/spec/test_spec.lua
@@ -5,15 +5,15 @@ local testing_paths = test_env.testing_paths
 local write_file = test_env.write_file
 
 local extra_rocks = {
-   "/busted-2.0.0-1.rockspec",
+   "/busted-2.2.0-1.src.rock",
    "/lua_cliargs-3.0-1.src.rock",
    "/luafilesystem-${LUAFILESYSTEM}.src.rock",
    "/luasystem-0.2.1-0.src.rock",
    "/dkjson-${DKJSON}.src.rock",
-   "/say-1.3-1.rockspec",
-   "/luassert-1.8.0-0.rockspec",
-   "/lua-term-0.7-1.rockspec",
-   "/penlight-1.5.4-1.rockspec",
+   "/say-1.4.1-3.src.rock",
+   "/luassert-1.9.0-1.src.rock",
+   "/penlight-1.13.1-1.src.rock",
+   "/lua-term-0.8-1.rockspec",
    "/mediator_lua-1.1.2-0.rockspec",
 }
 
diff --git a/spec/util/test_env.lua b/spec/util/test_env.lua
index 5d385db3..1d38cec6 100644
--- a/spec/util/test_env.lua
+++ b/spec/util/test_env.lua
@@ -1080,7 +1080,6 @@ function test_env.main()
    if test_env.TYPE_TEST_ENV == "full" then
       table.insert(urls, "/luafilesystem-${LUAFILESYSTEM}.src.rock")
       table.insert(urls, "/luasocket-${LUASOCKET}.src.rock")
-      table.insert(urls, "/luasocket-${LUASOCKET}.rockspec")
       table.insert(urls, "/luasec-${LUASEC}.src.rock")
       table.insert(urls, "/md5-1.2-1.src.rock")
       table.insert(urls, "/manifests/hisham/lua-zlib-1.2-0.src.rock")
@@ -1099,9 +1098,7 @@ function test_env.main()
    end
 
    -- luacov is needed for both minimal or full environment
-   table.insert(urls, "/luacov-${LUACOV}.rockspec")
    table.insert(urls, "/luacov-${LUACOV}.src.rock")
-   table.insert(urls, "/cluacov-${CLUACOV}.rockspec")
    table.insert(urls, "/cluacov-${CLUACOV}.src.rock")
    table.insert(rocks, "luacov")
    table.insert(rocks, "cluacov")