From 8b64f34e37aaefc745437e339e61ac66971925b9 Mon Sep 17 00:00:00 2001 From: ruki Date: Sat, 24 Feb 2024 00:53:26 +0800 Subject: [PATCH 1/3] add package rule test --- .../package_rule/repo/packages/f/foo/rules/test.lua | 11 +++++++++++ .../package_rule/repo/packages/f/foo/xmake.lua | 3 +++ tests/projects/package/package_rule/src/main.c | 6 ++++++ tests/projects/package/package_rule/src/test.md | 0 tests/projects/package/package_rule/test.lua | 12 ++++++++++++ tests/projects/package/package_rule/xmake.lua | 11 +++++++++++ 6 files changed, 43 insertions(+) create mode 100644 tests/projects/package/package_rule/repo/packages/f/foo/rules/test.lua create mode 100644 tests/projects/package/package_rule/repo/packages/f/foo/xmake.lua create mode 100755 tests/projects/package/package_rule/src/main.c create mode 100644 tests/projects/package/package_rule/src/test.md create mode 100644 tests/projects/package/package_rule/test.lua create mode 100644 tests/projects/package/package_rule/xmake.lua diff --git a/tests/projects/package/package_rule/repo/packages/f/foo/rules/test.lua b/tests/projects/package/package_rule/repo/packages/f/foo/rules/test.lua new file mode 100644 index 00000000000..5888ea6fdc7 --- /dev/null +++ b/tests/projects/package/package_rule/repo/packages/f/foo/rules/test.lua @@ -0,0 +1,11 @@ +rule("test") + set_extensions(".md") + on_config(function (target) + print("test: config %s", target:name()) + end) + on_build_file(function(target, sourcefile) + print("test: build %s", sourcefile) + end) + after_clean(function (target) + print("test: clean") + end) diff --git a/tests/projects/package/package_rule/repo/packages/f/foo/xmake.lua b/tests/projects/package/package_rule/repo/packages/f/foo/xmake.lua new file mode 100644 index 00000000000..fc5b23da299 --- /dev/null +++ b/tests/projects/package/package_rule/repo/packages/f/foo/xmake.lua @@ -0,0 +1,3 @@ +package("foo") + on_install(function() + end) diff --git a/tests/projects/package/package_rule/src/main.c b/tests/projects/package/package_rule/src/main.c new file mode 100755 index 00000000000..113930e1a2d --- /dev/null +++ b/tests/projects/package/package_rule/src/main.c @@ -0,0 +1,6 @@ +#include + +int main(int argc, char** argv) { + printf("hello world!\n"); + return 0; +} diff --git a/tests/projects/package/package_rule/src/test.md b/tests/projects/package/package_rule/src/test.md new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/projects/package/package_rule/test.lua b/tests/projects/package/package_rule/test.lua new file mode 100644 index 00000000000..4964fecaa55 --- /dev/null +++ b/tests/projects/package/package_rule/test.lua @@ -0,0 +1,12 @@ +function main(t) + + -- freebsd ci is slower + if is_host("bsd") then + return + end + + -- only for x86/x64, because it will take too long time on ci with arm/mips + if os.subarch():startswith("x") or os.subarch() == "i386" then + t:build() + end +end diff --git a/tests/projects/package/package_rule/xmake.lua b/tests/projects/package/package_rule/xmake.lua new file mode 100644 index 00000000000..f3b1f56b4c2 --- /dev/null +++ b/tests/projects/package/package_rule/xmake.lua @@ -0,0 +1,11 @@ +add_rules("mode.debug", "mode.release") + +add_requires("foo") +add_repositories("myrepo ./repo") + +target("console") + set_kind("binary") + add_files("src/main.c", "src/*.md") + add_packages("foo") + add_rules("@foo/test") + From b3fd12f939e8776ef66e81b4079119d8a70be730 Mon Sep 17 00:00:00 2001 From: ruki Date: Sat, 24 Feb 2024 00:54:21 +0800 Subject: [PATCH 2/3] switch to cpp --- tests/projects/package/package_rule/src/{main.c => main.cpp} | 0 tests/projects/package/package_rule/xmake.lua | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename tests/projects/package/package_rule/src/{main.c => main.cpp} (100%) diff --git a/tests/projects/package/package_rule/src/main.c b/tests/projects/package/package_rule/src/main.cpp similarity index 100% rename from tests/projects/package/package_rule/src/main.c rename to tests/projects/package/package_rule/src/main.cpp diff --git a/tests/projects/package/package_rule/xmake.lua b/tests/projects/package/package_rule/xmake.lua index f3b1f56b4c2..be1518fa0e1 100644 --- a/tests/projects/package/package_rule/xmake.lua +++ b/tests/projects/package/package_rule/xmake.lua @@ -5,7 +5,7 @@ add_repositories("myrepo ./repo") target("console") set_kind("binary") - add_files("src/main.c", "src/*.md") + add_files("src/main.cpp", "src/*.md") add_packages("foo") add_rules("@foo/test") From c7d5e01c9908d9e24dabe8893aff6e022a44afe6 Mon Sep 17 00:00:00 2001 From: ruki Date: Sat, 24 Feb 2024 22:08:41 +0800 Subject: [PATCH 3/3] fix test --- .../repo/packages/f/foo/rules/{test.lua => markdown.lua} | 2 +- tests/projects/package/package_rule/xmake.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename tests/projects/package/package_rule/repo/packages/f/foo/rules/{test.lua => markdown.lua} (94%) diff --git a/tests/projects/package/package_rule/repo/packages/f/foo/rules/test.lua b/tests/projects/package/package_rule/repo/packages/f/foo/rules/markdown.lua similarity index 94% rename from tests/projects/package/package_rule/repo/packages/f/foo/rules/test.lua rename to tests/projects/package/package_rule/repo/packages/f/foo/rules/markdown.lua index 5888ea6fdc7..bb824d2a2db 100644 --- a/tests/projects/package/package_rule/repo/packages/f/foo/rules/test.lua +++ b/tests/projects/package/package_rule/repo/packages/f/foo/rules/markdown.lua @@ -1,4 +1,4 @@ -rule("test") +rule("markdown") set_extensions(".md") on_config(function (target) print("test: config %s", target:name()) diff --git a/tests/projects/package/package_rule/xmake.lua b/tests/projects/package/package_rule/xmake.lua index be1518fa0e1..13916391ef9 100644 --- a/tests/projects/package/package_rule/xmake.lua +++ b/tests/projects/package/package_rule/xmake.lua @@ -7,5 +7,5 @@ target("console") set_kind("binary") add_files("src/main.cpp", "src/*.md") add_packages("foo") - add_rules("@foo/test") + add_rules("@foo/markdown")