diff options
Diffstat (limited to 'tests')
11 files changed, 17 insertions, 18 deletions
diff --git a/tests/actions/addon/projects/autofetch-badinclude/xmake-addons.lua b/tests/actions/addon/projects/autofetch-badinclude/xmake-addons.lua deleted file mode 100644 index 6931855ae..000000000 --- a/tests/actions/addon/projects/autofetch-badinclude/xmake-addons.lua +++ /dev/null @@ -1,2 +0,0 @@ --- this file only declares the addons, it cannot reference them -includes("@addon/custom-include/check") diff --git a/tests/actions/addon/projects/autofetch-badinclude/xmake.lua b/tests/actions/addon/projects/autofetch-badinclude/xmake.lua deleted file mode 100644 index 0d94cf61c..000000000 --- a/tests/actions/addon/projects/autofetch-badinclude/xmake.lua +++ /dev/null @@ -1,2 +0,0 @@ -target("test") - set_kind("phony") diff --git a/tests/actions/addon/projects/autofetch-badname/xmake-addons.lua b/tests/actions/addon/projects/autofetch-badname/xmake-addons.lua deleted file mode 100644 index 165325fb7..000000000 --- a/tests/actions/addon/projects/autofetch-badname/xmake-addons.lua +++ /dev/null @@ -1,2 +0,0 @@ --- the `addon` name is reserved for the addon references -add_addons("addon") diff --git a/tests/actions/addon/projects/autofetch-badname/xmake.lua b/tests/actions/addon/projects/autofetch-badname/xmake.lua index 0d94cf61c..ffbf6cbe4 100644 --- a/tests/actions/addon/projects/autofetch-badname/xmake.lua +++ b/tests/actions/addon/projects/autofetch-badname/xmake.lua @@ -1,2 +1,5 @@ +-- the `addon` name is reserved for the addon references +add_addons("addon") + target("test") set_kind("phony") diff --git a/tests/actions/addon/projects/autofetch-build/xmake-addons.lua b/tests/actions/addon/projects/autofetch-build/xmake-addons.lua deleted file mode 100644 index 2091e3b7f..000000000 --- a/tests/actions/addon/projects/autofetch-build/xmake-addons.lua +++ /dev/null @@ -1,2 +0,0 @@ --- the addons which this project needs, they are installed automatically when we load it -add_addons("custom-include", "custom-rule", "custom-toolchain") diff --git a/tests/actions/addon/projects/autofetch-build/xmake.lua b/tests/actions/addon/projects/autofetch-build/xmake.lua index bad3f8928..862ddf676 100644 --- a/tests/actions/addon/projects/autofetch-build/xmake.lua +++ b/tests/actions/addon/projects/autofetch-build/xmake.lua @@ -1,3 +1,6 @@ +-- the addons which this project needs, they are installed automatically +add_addons("custom-include", "custom-rule", "custom-toolchain") + -- the option comes from the includes file of an addon includes("@addon/custom-include/check") diff --git a/tests/actions/addon/projects/autofetch-lockmiss/xmake-addons.lua b/tests/actions/addon/projects/autofetch-lockmiss/xmake-addons.lua deleted file mode 100644 index a85e0fe11..000000000 --- a/tests/actions/addon/projects/autofetch-lockmiss/xmake-addons.lua +++ /dev/null @@ -1 +0,0 @@ -add_addons("custom-include") diff --git a/tests/actions/addon/projects/autofetch-lockmiss/xmake.lua b/tests/actions/addon/projects/autofetch-lockmiss/xmake.lua index 0d94cf61c..a96a4e713 100644 --- a/tests/actions/addon/projects/autofetch-lockmiss/xmake.lua +++ b/tests/actions/addon/projects/autofetch-lockmiss/xmake.lua @@ -1,2 +1,4 @@ +add_addons("custom-include") + target("test") set_kind("phony") diff --git a/tests/actions/addon/projects/autofetch/xmake-addons.lua b/tests/actions/addon/projects/autofetch/xmake-addons.lua deleted file mode 100644 index a85e0fe11..000000000 --- a/tests/actions/addon/projects/autofetch/xmake-addons.lua +++ /dev/null @@ -1 +0,0 @@ -add_addons("custom-include") diff --git a/tests/actions/addon/projects/autofetch/xmake.lua b/tests/actions/addon/projects/autofetch/xmake.lua index 4eaca0785..75c909904 100644 --- a/tests/actions/addon/projects/autofetch/xmake.lua +++ b/tests/actions/addon/projects/autofetch/xmake.lua @@ -1,3 +1,6 @@ +-- the addons which this project needs, they are installed automatically +add_addons("custom-include") + -- the addon is installed automatically, so we can use its includes file here includes("@addon/custom-include/check") diff --git a/tests/actions/addon/test.lua b/tests/actions/addon/test.lua index 01030c4b8..05818a054 100644 --- a/tests/actions/addon/test.lua +++ b/tests/actions/addon/test.lua @@ -305,7 +305,7 @@ int main(int argc, char** argv) { return 0; } end) end --- the addons which a project declares in `xmake-addons.lua` are installed automatically +-- the addons which a project declares with `add_addons` are installed automatically -- -- @note they must be installed before loading the project, it may use their includes files function test_autofetch(t) @@ -345,7 +345,7 @@ function test_autofetch_skipped_for_option_menu(t) end) end --- a complete project which declares its addons in `xmake-addons.lua` and builds with them, +-- a complete project which declares its addons with `add_addons` and builds with them, -- @see tests/actions/addon/projects/autofetch-build function test_autofetch_build(t) @@ -396,13 +396,11 @@ function test_autofetch_lock_missing_version(t) end) end --- the addons file only declares the addons, it cannot reference them +-- the declared addons are checked, e.g. the reserved names function test_autofetch_invalid(t) - for _, name in ipairs({"autofetch-badinclude", "autofetch-badname"}) do - _with_project(name, function () - t:require_not(try { function () os.runv("xmake", {"config", "-y"}); return true end }) - end) - end + _with_project("autofetch-badname", function () + t:require_not(try { function () os.runv("xmake", {"config", "-y"}); return true end }) + end) end -- the addons can be installed from a repository, by plain name and by repo@name |