From 8d8127bdc674d5267e3a2ef87b8371c9b42526d8 Mon Sep 17 00:00:00 2001 From: Arthur LAURENT Date: Sun, 31 Jul 2022 15:29:13 +0200 Subject: Update unit tests to new add_modulefiles --- tests/projects/c++/modules/class/xmake.lua | 3 ++- tests/projects/c++/modules/dependence/xmake.lua | 3 ++- tests/projects/c++/modules/dependence2/xmake.lua | 3 ++- tests/projects/c++/modules/hello with spaces/xmake.lua | 3 ++- tests/projects/c++/modules/hello/xmake.lua | 3 ++- tests/projects/c++/modules/impl_unit/xmake.lua | 3 ++- tests/projects/c++/modules/inline_and_template/xmake.lua | 3 ++- tests/projects/c++/modules/partitions/xmake.lua | 3 ++- tests/projects/c++/modules/staticlib/xmake.lua | 2 +- tests/projects/c++/modules/submodules/xmake.lua | 3 ++- tests/projects/c++/modules/submodules2/xmake.lua | 3 ++- 11 files changed, 21 insertions(+), 11 deletions(-) (limited to 'tests/projects/c++/modules') diff --git a/tests/projects/c++/modules/class/xmake.lua b/tests/projects/c++/modules/class/xmake.lua index 6d6eaddee..850f7ae18 100644 --- a/tests/projects/c++/modules/class/xmake.lua +++ b/tests/projects/c++/modules/class/xmake.lua @@ -1,4 +1,5 @@ set_languages("c++20") target("class") set_kind("binary") - add_files("src/*.cpp", "src/*.mpp") + add_modulefiles("src/*.mpp") + add_files("src/*.cpp") diff --git a/tests/projects/c++/modules/dependence/xmake.lua b/tests/projects/c++/modules/dependence/xmake.lua index 6d64b49b1..0346e1161 100644 --- a/tests/projects/c++/modules/dependence/xmake.lua +++ b/tests/projects/c++/modules/dependence/xmake.lua @@ -1,4 +1,5 @@ set_languages("c++20") target("dependence") set_kind("binary") - add_files("src/*.cpp", "src/*.mpp") + add_modulefiles("src/*.mpp") + add_files("src/*.cpp") diff --git a/tests/projects/c++/modules/dependence2/xmake.lua b/tests/projects/c++/modules/dependence2/xmake.lua index 6d64b49b1..0346e1161 100644 --- a/tests/projects/c++/modules/dependence2/xmake.lua +++ b/tests/projects/c++/modules/dependence2/xmake.lua @@ -1,4 +1,5 @@ set_languages("c++20") target("dependence") set_kind("binary") - add_files("src/*.cpp", "src/*.mpp") + add_modulefiles("src/*.mpp") + add_files("src/*.cpp") diff --git a/tests/projects/c++/modules/hello with spaces/xmake.lua b/tests/projects/c++/modules/hello with spaces/xmake.lua index 4f46b699d..60188ed8a 100644 --- a/tests/projects/c++/modules/hello with spaces/xmake.lua +++ b/tests/projects/c++/modules/hello with spaces/xmake.lua @@ -2,4 +2,5 @@ add_rules("mode.release", "mode.debug") set_languages("c++20") target("A hello") set_kind("binary") - add_files("src/*.cpp", "src/*.mpp") + add_modulefiles("src/*.mpp") + add_files("src/*.cpp") diff --git a/tests/projects/c++/modules/hello/xmake.lua b/tests/projects/c++/modules/hello/xmake.lua index 2315cf287..caa462cd1 100644 --- a/tests/projects/c++/modules/hello/xmake.lua +++ b/tests/projects/c++/modules/hello/xmake.lua @@ -1,4 +1,5 @@ set_languages("c++20") target("hello") set_kind("binary") - add_files("src/*.cpp", "src/*.mpp") + add_modulefiles("src/*.mpp") + add_files("src/*.cpp") diff --git a/tests/projects/c++/modules/impl_unit/xmake.lua b/tests/projects/c++/modules/impl_unit/xmake.lua index abe41d20a..135cf2f73 100644 --- a/tests/projects/c++/modules/impl_unit/xmake.lua +++ b/tests/projects/c++/modules/impl_unit/xmake.lua @@ -1,4 +1,5 @@ set_languages("c++20") target("impl_unit") set_kind("binary") - add_files("src/*.cpp", "src/*.mpp") + add_modulefiles("src/*.mpp") + add_files("src/*.cpp") diff --git a/tests/projects/c++/modules/inline_and_template/xmake.lua b/tests/projects/c++/modules/inline_and_template/xmake.lua index 4810edb85..233117b26 100644 --- a/tests/projects/c++/modules/inline_and_template/xmake.lua +++ b/tests/projects/c++/modules/inline_and_template/xmake.lua @@ -1,4 +1,5 @@ set_languages("c++20") target("inline_and_template") set_kind("binary") - add_files("src/*.cpp", "src/*.mpp") + add_modulefiles("src/*.mpp") + add_files("src/*.cpp") diff --git a/tests/projects/c++/modules/partitions/xmake.lua b/tests/projects/c++/modules/partitions/xmake.lua index 672034947..e77b8d86d 100644 --- a/tests/projects/c++/modules/partitions/xmake.lua +++ b/tests/projects/c++/modules/partitions/xmake.lua @@ -1,4 +1,5 @@ set_languages("c++20") target("math") set_kind("binary") - add_files("src/*.cpp", "src/*.mpp") + add_modulefiles("src/*.mpp") + add_files("src/*.cpp") diff --git a/tests/projects/c++/modules/staticlib/xmake.lua b/tests/projects/c++/modules/staticlib/xmake.lua index 93045c18f..bf1d8f02f 100644 --- a/tests/projects/c++/modules/staticlib/xmake.lua +++ b/tests/projects/c++/modules/staticlib/xmake.lua @@ -2,7 +2,7 @@ set_languages("c++20") target("mod") set_kind("static") - add_files("src/mod.mpp", "src/mod.cpp") + add_modulefiles("src/mod.mpp", "src/mod.cpp") target("test") set_kind("binary") diff --git a/tests/projects/c++/modules/submodules/xmake.lua b/tests/projects/c++/modules/submodules/xmake.lua index 672034947..e77b8d86d 100644 --- a/tests/projects/c++/modules/submodules/xmake.lua +++ b/tests/projects/c++/modules/submodules/xmake.lua @@ -1,4 +1,5 @@ set_languages("c++20") target("math") set_kind("binary") - add_files("src/*.cpp", "src/*.mpp") + add_modulefiles("src/*.mpp") + add_files("src/*.cpp") diff --git a/tests/projects/c++/modules/submodules2/xmake.lua b/tests/projects/c++/modules/submodules2/xmake.lua index 672034947..e77b8d86d 100644 --- a/tests/projects/c++/modules/submodules2/xmake.lua +++ b/tests/projects/c++/modules/submodules2/xmake.lua @@ -1,4 +1,5 @@ set_languages("c++20") target("math") set_kind("binary") - add_files("src/*.cpp", "src/*.mpp") + add_modulefiles("src/*.mpp") + add_files("src/*.cpp") -- cgit v1.3.1 From dee01ba2ff847c67d1da4b63565f6afe332a857c Mon Sep 17 00:00:00 2001 From: Arthur LAURENT Date: Sun, 31 Jul 2022 15:29:13 +0200 Subject: Revert "Update unit tests to new add_modulefiles" This reverts commit 8d8127bdc674d5267e3a2ef87b8371c9b42526d8. --- tests/projects/c++/modules/class/xmake.lua | 3 +-- tests/projects/c++/modules/dependence/xmake.lua | 3 +-- tests/projects/c++/modules/dependence2/xmake.lua | 3 +-- tests/projects/c++/modules/hello with spaces/xmake.lua | 3 +-- tests/projects/c++/modules/hello/xmake.lua | 3 +-- tests/projects/c++/modules/impl_unit/xmake.lua | 3 +-- tests/projects/c++/modules/inline_and_template/xmake.lua | 3 +-- tests/projects/c++/modules/partitions/xmake.lua | 3 +-- tests/projects/c++/modules/staticlib/xmake.lua | 2 +- tests/projects/c++/modules/submodules/xmake.lua | 3 +-- tests/projects/c++/modules/submodules2/xmake.lua | 3 +-- 11 files changed, 11 insertions(+), 21 deletions(-) (limited to 'tests/projects/c++/modules') diff --git a/tests/projects/c++/modules/class/xmake.lua b/tests/projects/c++/modules/class/xmake.lua index 850f7ae18..6d6eaddee 100644 --- a/tests/projects/c++/modules/class/xmake.lua +++ b/tests/projects/c++/modules/class/xmake.lua @@ -1,5 +1,4 @@ set_languages("c++20") target("class") set_kind("binary") - add_modulefiles("src/*.mpp") - add_files("src/*.cpp") + add_files("src/*.cpp", "src/*.mpp") diff --git a/tests/projects/c++/modules/dependence/xmake.lua b/tests/projects/c++/modules/dependence/xmake.lua index 0346e1161..6d64b49b1 100644 --- a/tests/projects/c++/modules/dependence/xmake.lua +++ b/tests/projects/c++/modules/dependence/xmake.lua @@ -1,5 +1,4 @@ set_languages("c++20") target("dependence") set_kind("binary") - add_modulefiles("src/*.mpp") - add_files("src/*.cpp") + add_files("src/*.cpp", "src/*.mpp") diff --git a/tests/projects/c++/modules/dependence2/xmake.lua b/tests/projects/c++/modules/dependence2/xmake.lua index 0346e1161..6d64b49b1 100644 --- a/tests/projects/c++/modules/dependence2/xmake.lua +++ b/tests/projects/c++/modules/dependence2/xmake.lua @@ -1,5 +1,4 @@ set_languages("c++20") target("dependence") set_kind("binary") - add_modulefiles("src/*.mpp") - add_files("src/*.cpp") + add_files("src/*.cpp", "src/*.mpp") diff --git a/tests/projects/c++/modules/hello with spaces/xmake.lua b/tests/projects/c++/modules/hello with spaces/xmake.lua index 60188ed8a..4f46b699d 100644 --- a/tests/projects/c++/modules/hello with spaces/xmake.lua +++ b/tests/projects/c++/modules/hello with spaces/xmake.lua @@ -2,5 +2,4 @@ add_rules("mode.release", "mode.debug") set_languages("c++20") target("A hello") set_kind("binary") - add_modulefiles("src/*.mpp") - add_files("src/*.cpp") + add_files("src/*.cpp", "src/*.mpp") diff --git a/tests/projects/c++/modules/hello/xmake.lua b/tests/projects/c++/modules/hello/xmake.lua index caa462cd1..2315cf287 100644 --- a/tests/projects/c++/modules/hello/xmake.lua +++ b/tests/projects/c++/modules/hello/xmake.lua @@ -1,5 +1,4 @@ set_languages("c++20") target("hello") set_kind("binary") - add_modulefiles("src/*.mpp") - add_files("src/*.cpp") + add_files("src/*.cpp", "src/*.mpp") diff --git a/tests/projects/c++/modules/impl_unit/xmake.lua b/tests/projects/c++/modules/impl_unit/xmake.lua index 135cf2f73..abe41d20a 100644 --- a/tests/projects/c++/modules/impl_unit/xmake.lua +++ b/tests/projects/c++/modules/impl_unit/xmake.lua @@ -1,5 +1,4 @@ set_languages("c++20") target("impl_unit") set_kind("binary") - add_modulefiles("src/*.mpp") - add_files("src/*.cpp") + add_files("src/*.cpp", "src/*.mpp") diff --git a/tests/projects/c++/modules/inline_and_template/xmake.lua b/tests/projects/c++/modules/inline_and_template/xmake.lua index 233117b26..4810edb85 100644 --- a/tests/projects/c++/modules/inline_and_template/xmake.lua +++ b/tests/projects/c++/modules/inline_and_template/xmake.lua @@ -1,5 +1,4 @@ set_languages("c++20") target("inline_and_template") set_kind("binary") - add_modulefiles("src/*.mpp") - add_files("src/*.cpp") + add_files("src/*.cpp", "src/*.mpp") diff --git a/tests/projects/c++/modules/partitions/xmake.lua b/tests/projects/c++/modules/partitions/xmake.lua index e77b8d86d..672034947 100644 --- a/tests/projects/c++/modules/partitions/xmake.lua +++ b/tests/projects/c++/modules/partitions/xmake.lua @@ -1,5 +1,4 @@ set_languages("c++20") target("math") set_kind("binary") - add_modulefiles("src/*.mpp") - add_files("src/*.cpp") + add_files("src/*.cpp", "src/*.mpp") diff --git a/tests/projects/c++/modules/staticlib/xmake.lua b/tests/projects/c++/modules/staticlib/xmake.lua index bf1d8f02f..93045c18f 100644 --- a/tests/projects/c++/modules/staticlib/xmake.lua +++ b/tests/projects/c++/modules/staticlib/xmake.lua @@ -2,7 +2,7 @@ set_languages("c++20") target("mod") set_kind("static") - add_modulefiles("src/mod.mpp", "src/mod.cpp") + add_files("src/mod.mpp", "src/mod.cpp") target("test") set_kind("binary") diff --git a/tests/projects/c++/modules/submodules/xmake.lua b/tests/projects/c++/modules/submodules/xmake.lua index e77b8d86d..672034947 100644 --- a/tests/projects/c++/modules/submodules/xmake.lua +++ b/tests/projects/c++/modules/submodules/xmake.lua @@ -1,5 +1,4 @@ set_languages("c++20") target("math") set_kind("binary") - add_modulefiles("src/*.mpp") - add_files("src/*.cpp") + add_files("src/*.cpp", "src/*.mpp") diff --git a/tests/projects/c++/modules/submodules2/xmake.lua b/tests/projects/c++/modules/submodules2/xmake.lua index e77b8d86d..672034947 100644 --- a/tests/projects/c++/modules/submodules2/xmake.lua +++ b/tests/projects/c++/modules/submodules2/xmake.lua @@ -1,5 +1,4 @@ set_languages("c++20") target("math") set_kind("binary") - add_modulefiles("src/*.mpp") - add_files("src/*.cpp") + add_files("src/*.cpp", "src/*.mpp") -- cgit v1.3.1 From dcf5a1dfa3e592563093e862e0bb4ecd2ac3b3ba Mon Sep 17 00:00:00 2001 From: Arthur LAURENT Date: Wed, 3 Aug 2022 02:36:31 +0200 Subject: [C++20 Modules] Add tests for headerunits --- tests/projects/c++/modules/stl_headerunit/src/hello.mpp | 11 +++++++++++ tests/projects/c++/modules/stl_headerunit/src/main.cpp | 6 ++++++ tests/projects/c++/modules/stl_headerunit/xmake.lua | 4 ++++ tests/projects/c++/modules/user_headerunit/src/header.hpp | 5 +++++ tests/projects/c++/modules/user_headerunit/src/hello.mpp | 10 ++++++++++ tests/projects/c++/modules/user_headerunit/src/main.cpp | 7 +++++++ tests/projects/c++/modules/user_headerunit/xmake.lua | 5 +++++ 7 files changed, 48 insertions(+) create mode 100644 tests/projects/c++/modules/stl_headerunit/src/hello.mpp create mode 100644 tests/projects/c++/modules/stl_headerunit/src/main.cpp create mode 100644 tests/projects/c++/modules/stl_headerunit/xmake.lua create mode 100644 tests/projects/c++/modules/user_headerunit/src/header.hpp create mode 100644 tests/projects/c++/modules/user_headerunit/src/hello.mpp create mode 100644 tests/projects/c++/modules/user_headerunit/src/main.cpp create mode 100644 tests/projects/c++/modules/user_headerunit/xmake.lua (limited to 'tests/projects/c++/modules') diff --git a/tests/projects/c++/modules/stl_headerunit/src/hello.mpp b/tests/projects/c++/modules/stl_headerunit/src/hello.mpp new file mode 100644 index 000000000..d45c5759e --- /dev/null +++ b/tests/projects/c++/modules/stl_headerunit/src/hello.mpp @@ -0,0 +1,11 @@ +module; + +export module hello; + +import ; + +export namespace hello { + void say(const char* str) { + std::cout << str << std::endl; + } +} diff --git a/tests/projects/c++/modules/stl_headerunit/src/main.cpp b/tests/projects/c++/modules/stl_headerunit/src/main.cpp new file mode 100644 index 000000000..1e5cc698f --- /dev/null +++ b/tests/projects/c++/modules/stl_headerunit/src/main.cpp @@ -0,0 +1,6 @@ +import hello; + +int main() { + hello::say("hello module!"); + return 0; +} diff --git a/tests/projects/c++/modules/stl_headerunit/xmake.lua b/tests/projects/c++/modules/stl_headerunit/xmake.lua new file mode 100644 index 000000000..e85378c46 --- /dev/null +++ b/tests/projects/c++/modules/stl_headerunit/xmake.lua @@ -0,0 +1,4 @@ +set_languages("c++20") +target("stl_headerunit") + set_kind("binary") + add_files("src/*.cpp", "src/*.mpp") diff --git a/tests/projects/c++/modules/user_headerunit/src/header.hpp b/tests/projects/c++/modules/user_headerunit/src/header.hpp new file mode 100644 index 000000000..15e522e15 --- /dev/null +++ b/tests/projects/c++/modules/user_headerunit/src/header.hpp @@ -0,0 +1,5 @@ +#pragma once + +namespace hello { + extern constexpr auto FOO = "Hello"; +} diff --git a/tests/projects/c++/modules/user_headerunit/src/hello.mpp b/tests/projects/c++/modules/user_headerunit/src/hello.mpp new file mode 100644 index 000000000..5b2f434ad --- /dev/null +++ b/tests/projects/c++/modules/user_headerunit/src/hello.mpp @@ -0,0 +1,10 @@ +module; +#include + +export module hello; + +export namespace hello { + void say(const char *arg) { + printf("%s\n", arg); + } +} diff --git a/tests/projects/c++/modules/user_headerunit/src/main.cpp b/tests/projects/c++/modules/user_headerunit/src/main.cpp new file mode 100644 index 000000000..ad786367e --- /dev/null +++ b/tests/projects/c++/modules/user_headerunit/src/main.cpp @@ -0,0 +1,7 @@ +import hello; +import "header.hpp"; + +int main() { + hello::say(hello::FOO); + return 0; +} diff --git a/tests/projects/c++/modules/user_headerunit/xmake.lua b/tests/projects/c++/modules/user_headerunit/xmake.lua new file mode 100644 index 000000000..dae91d11f --- /dev/null +++ b/tests/projects/c++/modules/user_headerunit/xmake.lua @@ -0,0 +1,5 @@ +set_languages("c++20") +target("user_headerunit") + set_kind("binary") + add_headerfiles("src/*.hpp") + add_files("src/*.cpp", "src/*.mpp") -- cgit v1.3.1