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(-) 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