diff options
| author | Hisham Muhammad <hisham@gobolinux.org> | 2015-06-24 15:15:33 -0300 |
|---|---|---|
| committer | Hisham Muhammad <hisham@gobolinux.org> | 2015-06-24 15:15:33 -0300 |
| commit | ca619eb7e29849c77783fdf3c7b0e2cfbe554629 (patch) | |
| tree | 5cb16e58a7bbc00727f523b7e6f7ab69e8b81030 | |
| parent | 8064e99d748e74194345617611c929dde2b69628 (diff) | |
| parent | 8f7897c5851117d817d59a23353a61e047aee900 (diff) | |
| download | luarocks-ca619eb7e29849c77783fdf3c7b0e2cfbe554629.tar.gz luarocks-ca619eb7e29849c77783fdf3c7b0e2cfbe554629.tar.bz2 luarocks-ca619eb7e29849c77783fdf3c7b0e2cfbe554629.zip | |
Merge pull request #394 from ignacio/build_mandatory
Make 'build' field in rockspecs mandatory.
| -rw-r--r-- | src/luarocks/type_check.lua | 3 | ||||
| -rw-r--r-- | test/testfiles/no_build_table-0.1-1.rockspec | 12 | ||||
| -rw-r--r-- | test/testing.lua | 1 | ||||
| -rwxr-xr-x | test/testing.sh | 1 |
4 files changed, 16 insertions, 1 deletions
diff --git a/src/luarocks/type_check.lua b/src/luarocks/type_check.lua index 5e3bfb0d..65b4fc15 100644 --- a/src/luarocks/type_check.lua +++ b/src/luarocks/type_check.lua | |||
| @@ -87,7 +87,8 @@ local rockspec_types = { | |||
| 87 | copy_directories = { | 87 | copy_directories = { |
| 88 | _any = string_1, | 88 | _any = string_1, |
| 89 | }, | 89 | }, |
| 90 | _more = true | 90 | _more = true, |
| 91 | _mandatory = true | ||
| 91 | }, | 92 | }, |
| 92 | hooks = { | 93 | hooks = { |
| 93 | platforms = {}, -- recursively defined below | 94 | platforms = {}, -- recursively defined below |
diff --git a/test/testfiles/no_build_table-0.1-1.rockspec b/test/testfiles/no_build_table-0.1-1.rockspec new file mode 100644 index 00000000..5d79e9a0 --- /dev/null +++ b/test/testfiles/no_build_table-0.1-1.rockspec | |||
| @@ -0,0 +1,12 @@ | |||
| 1 | package = "no_build_table" | ||
| 2 | version = "0.1-1" | ||
| 3 | source = { | ||
| 4 | -- any valid URL | ||
| 5 | url = "https://raw.github.com/keplerproject/luarocks/master/src/luarocks/build.lua" | ||
| 6 | } | ||
| 7 | description = { | ||
| 8 | summary = "A rockspec with no build field", | ||
| 9 | } | ||
| 10 | dependencies = { | ||
| 11 | "lua >= 5.1" | ||
| 12 | } | ||
diff --git a/test/testing.lua b/test/testing.lua index 86f3ab34..44c6f098 100644 --- a/test/testing.lua +++ b/test/testing.lua | |||
| @@ -203,6 +203,7 @@ local tests = { | |||
| 203 | fail_lint_type_mismatch_string = function() return run '$luarocks lint "$testing_dir/testfiles/type_mismatch_string-1.0-1.rockspec"' end, | 203 | fail_lint_type_mismatch_string = function() return run '$luarocks lint "$testing_dir/testfiles/type_mismatch_string-1.0-1.rockspec"' end, |
| 204 | fail_lint_type_mismatch_version = function() return run '$luarocks lint "$testing_dir/testfiles/type_mismatch_version-1.0-1.rockspec"' end, | 204 | fail_lint_type_mismatch_version = function() return run '$luarocks lint "$testing_dir/testfiles/type_mismatch_version-1.0-1.rockspec"' end, |
| 205 | fail_lint_type_mismatch_table = function() return run '$luarocks lint "$testing_dir/testfiles/type_mismatch_table-1.0-1.rockspec"' end, | 205 | fail_lint_type_mismatch_table = function() return run '$luarocks lint "$testing_dir/testfiles/type_mismatch_table-1.0-1.rockspec"' end, |
| 206 | fail_lint_no_build_table = function() return run '$luarocks lint "$testing_dir/testfiles/no_build_table-0.1-1.rockspec"' end, | ||
| 206 | test_list = function() return run "$luarocks list" end, | 207 | test_list = function() return run "$luarocks list" end, |
| 207 | test_list_porcelain = function() return run "$luarocks list --porcelain" end, | 208 | test_list_porcelain = function() return run "$luarocks list --porcelain" end, |
| 208 | test_make_with_rockspec = function() | 209 | test_make_with_rockspec = function() |
diff --git a/test/testing.sh b/test/testing.sh index 8d972d4c..4338e48f 100755 --- a/test/testing.sh +++ b/test/testing.sh | |||
| @@ -419,6 +419,7 @@ test_lint_ok() { $luarocks download --rockspec validate-args ${verrev_validate_a | |||
| 419 | fail_lint_type_mismatch_string() { $luarocks lint "$testing_dir/testfiles/type_mismatch_string-1.0-1.rockspec"; } | 419 | fail_lint_type_mismatch_string() { $luarocks lint "$testing_dir/testfiles/type_mismatch_string-1.0-1.rockspec"; } |
| 420 | fail_lint_type_mismatch_version() { $luarocks lint "$testing_dir/testfiles/type_mismatch_version-1.0-1.rockspec"; } | 420 | fail_lint_type_mismatch_version() { $luarocks lint "$testing_dir/testfiles/type_mismatch_version-1.0-1.rockspec"; } |
| 421 | fail_lint_type_mismatch_table() { $luarocks lint "$testing_dir/testfiles/type_mismatch_table-1.0-1.rockspec"; } | 421 | fail_lint_type_mismatch_table() { $luarocks lint "$testing_dir/testfiles/type_mismatch_table-1.0-1.rockspec"; } |
| 422 | fail_lint_no_build_table() { $luarocks lint "$testing_dir/testfiles/no_build_table-0.1-1.rockspec"; } | ||
| 422 | 423 | ||
| 423 | test_list() { $luarocks list; } | 424 | test_list() { $luarocks list; } |
| 424 | test_list_porcelain() { $luarocks list --porcelain; } | 425 | test_list_porcelain() { $luarocks list --porcelain; } |
