summaryrefslogtreecommitdiff
path: root/spec/make_spec.lua
diff options
context:
space:
mode:
authorHisham Muhammad <hisham@gobolinux.org>2017-10-04 11:14:42 -0300
committerGitHub <noreply@github.com>2017-10-04 11:14:42 -0300
commit84b4fe99cac37850a97858e0b641043bd3178d8a (patch)
treeb4578689091b8360aed71f531faf2513b7d41684 /spec/make_spec.lua
parent100c18d048936b5a47f29f55e6ce8b24277fb70f (diff)
downloadluarocks-84b4fe99cac37850a97858e0b641043bd3178d8a.tar.gz
luarocks-84b4fe99cac37850a97858e0b641043bd3178d8a.tar.bz2
luarocks-84b4fe99cac37850a97858e0b641043bd3178d8a.zip
Use versioned files only. (#734)
Let's take the opportunity of a new major version to make an important cleanup: getting rid of the error-prone unversioned configuration files. This drops support for: * Unversioned config.lua -> use config-5.x.lua * Unversioned luarocks/site_config.lua -> it always generates luarocks/core/site_config_5_x.lua * Unversioned lib/luarocks/rocks -> it always uses lib/luarocks/rocks-5.x
Diffstat (limited to 'spec/make_spec.lua')
-rw-r--r--spec/make_spec.lua10
1 files changed, 5 insertions, 5 deletions
diff --git a/spec/make_spec.lua b/spec/make_spec.lua
index ab2d49a3..4c406c68 100644
--- a/spec/make_spec.lua
+++ b/spec/make_spec.lua
@@ -35,7 +35,7 @@ describe("LuaRocks make tests #blackbox #b_make", function()
35 35
36 -- test it 36 -- test it
37 assert.is_true(run.luarocks_bool("show luasocket")) 37 assert.is_true(run.luarocks_bool("show luasocket"))
38 assert.is.truthy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/luasocket/3.0rc1-2/luasocket-3.0rc1-2.rockspec")) 38 assert.is.truthy(lfs.attributes(testing_paths.testing_sys_rocks .. "/luasocket/3.0rc1-2/luasocket-3.0rc1-2.rockspec"))
39 39
40 -- delete downloaded and unpacked files 40 -- delete downloaded and unpacked files
41 lfs.chdir(testing_paths.luarocks_dir) 41 lfs.chdir(testing_paths.luarocks_dir)
@@ -63,7 +63,7 @@ describe("LuaRocks make tests #blackbox #b_make", function()
63 assert.is_true(run.luarocks_bool("make")) 63 assert.is_true(run.luarocks_bool("make"))
64 64
65 assert.is_true(run.luarocks_bool("show lxsh")) 65 assert.is_true(run.luarocks_bool("show lxsh"))
66 assert.is.truthy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/lxsh/0.8.6-3/lxsh-0.8.6-3.rockspec")) 66 assert.is.truthy(lfs.attributes(testing_paths.testing_sys_rocks .. "/lxsh/0.8.6-3/lxsh-0.8.6-3.rockspec"))
67 end) 67 end)
68 68
69 it("LuaRocks make unnamed rockspec", function() 69 it("LuaRocks make unnamed rockspec", function()
@@ -71,7 +71,7 @@ describe("LuaRocks make tests #blackbox #b_make", function()
71 assert.is_true(run.luarocks_bool("make")) 71 assert.is_true(run.luarocks_bool("make"))
72 72
73 assert.is_true(run.luarocks_bool("show lxsh")) 73 assert.is_true(run.luarocks_bool("show lxsh"))
74 assert.is.truthy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/lxsh/0.8.6-2/lxsh-0.8.6-2.rockspec")) 74 assert.is.truthy(lfs.attributes(testing_paths.testing_sys_rocks .. "/lxsh/0.8.6-2/lxsh-0.8.6-2.rockspec"))
75 os.remove("rockspec") 75 os.remove("rockspec")
76 end) 76 end)
77 77
@@ -81,7 +81,7 @@ describe("LuaRocks make tests #blackbox #b_make", function()
81 assert.is.truthy(output:match("Error: Inconsistency between rockspec filename")) 81 assert.is.truthy(output:match("Error: Inconsistency between rockspec filename"))
82 82
83 assert.is_false(run.luarocks_bool("show lxsh")) 83 assert.is_false(run.luarocks_bool("show lxsh"))
84 assert.is.falsy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/lxsh/0.8.6-2/lxsh-0.8.6-2.rockspec")) 84 assert.is.falsy(lfs.attributes(testing_paths.testing_sys_rocks .. "/lxsh/0.8.6-2/lxsh-0.8.6-2.rockspec"))
85 end) 85 end)
86 86
87 it("LuaRocks make ambiguous unnamed rockspec", function() 87 it("LuaRocks make ambiguous unnamed rockspec", function()
@@ -91,7 +91,7 @@ describe("LuaRocks make tests #blackbox #b_make", function()
91 assert.is.truthy(output:match("Error: Please specify which rockspec file to use")) 91 assert.is.truthy(output:match("Error: Please specify which rockspec file to use"))
92 92
93 assert.is_false(run.luarocks_bool("show lxsh")) 93 assert.is_false(run.luarocks_bool("show lxsh"))
94 assert.is.falsy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/lxsh/0.8.6-2/lxsh-0.8.6-2.rockspec")) 94 assert.is.falsy(lfs.attributes(testing_paths.testing_sys_rocks .. "/lxsh/0.8.6-2/lxsh-0.8.6-2.rockspec"))
95 end) 95 end)
96 96
97 it("LuaRocks make pack binary rock", function() 97 it("LuaRocks make pack binary rock", function()