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/inline_and_template/xmake.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'tests/projects/c++/modules/inline_and_template') 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") -- 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/inline_and_template') 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 d32859aa18fe79e2876bdb793956c15e0479aaee Mon Sep 17 00:00:00 2001 From: ruki Date: Sun, 7 Aug 2022 23:59:48 +0800 Subject: add some tests for cppmodules --- tests/projects/c++/modules/class/test.lua | 20 ++++++++++++++++++++ .../c++/modules/cpp_with_moduledeps/test.lua | 20 ++++++++++++++++++++ tests/projects/c++/modules/dependence/test.lua | 20 ++++++++++++++++++++ tests/projects/c++/modules/dependence2/test.lua | 20 ++++++++++++++++++++ .../projects/c++/modules/hello with spaces/test.lua | 20 ++++++++++++++++++++ tests/projects/c++/modules/hello/test.lua | 20 ++++++++++++++++++++ tests/projects/c++/modules/impl_unit/test.lua | 20 ++++++++++++++++++++ .../c++/modules/inline_and_template/test.lua | 20 ++++++++++++++++++++ tests/projects/c++/modules/staticlib/test.lua | 20 ++++++++++++++++++++ tests/projects/c++/modules/submodules/test.lua | 20 ++++++++++++++++++++ tests/projects/c++/modules/submodules2/test.lua | 20 ++++++++++++++++++++ 11 files changed, 220 insertions(+) create mode 100644 tests/projects/c++/modules/class/test.lua create mode 100644 tests/projects/c++/modules/cpp_with_moduledeps/test.lua create mode 100644 tests/projects/c++/modules/dependence/test.lua create mode 100644 tests/projects/c++/modules/dependence2/test.lua create mode 100644 tests/projects/c++/modules/hello with spaces/test.lua create mode 100644 tests/projects/c++/modules/hello/test.lua create mode 100644 tests/projects/c++/modules/impl_unit/test.lua create mode 100644 tests/projects/c++/modules/inline_and_template/test.lua create mode 100644 tests/projects/c++/modules/staticlib/test.lua create mode 100644 tests/projects/c++/modules/submodules/test.lua create mode 100644 tests/projects/c++/modules/submodules2/test.lua (limited to 'tests/projects/c++/modules/inline_and_template') diff --git a/tests/projects/c++/modules/class/test.lua b/tests/projects/c++/modules/class/test.lua new file mode 100644 index 000000000..76b141d6b --- /dev/null +++ b/tests/projects/c++/modules/class/test.lua @@ -0,0 +1,20 @@ +import("lib.detect.find_tool") +import("core.base.semver") + +function main(t) + local test = false + if is_subhost("windows") then + test = true + elseif is_host("linux", "macosx") then + local gcc = find_tool("gcc", {version = true}) + local clang = find_tool("clang", {version = true}) + if clang and clang.version and semver.compare(clang.version, "14.0") >= 0 then + test = true + elseif gcc and gcc.version and semver.compare(gcc.version, "11.0") >= 0 then + test = true + end + end + if test then + os.exec("xmake") + end +end diff --git a/tests/projects/c++/modules/cpp_with_moduledeps/test.lua b/tests/projects/c++/modules/cpp_with_moduledeps/test.lua new file mode 100644 index 000000000..76b141d6b --- /dev/null +++ b/tests/projects/c++/modules/cpp_with_moduledeps/test.lua @@ -0,0 +1,20 @@ +import("lib.detect.find_tool") +import("core.base.semver") + +function main(t) + local test = false + if is_subhost("windows") then + test = true + elseif is_host("linux", "macosx") then + local gcc = find_tool("gcc", {version = true}) + local clang = find_tool("clang", {version = true}) + if clang and clang.version and semver.compare(clang.version, "14.0") >= 0 then + test = true + elseif gcc and gcc.version and semver.compare(gcc.version, "11.0") >= 0 then + test = true + end + end + if test then + os.exec("xmake") + end +end diff --git a/tests/projects/c++/modules/dependence/test.lua b/tests/projects/c++/modules/dependence/test.lua new file mode 100644 index 000000000..76b141d6b --- /dev/null +++ b/tests/projects/c++/modules/dependence/test.lua @@ -0,0 +1,20 @@ +import("lib.detect.find_tool") +import("core.base.semver") + +function main(t) + local test = false + if is_subhost("windows") then + test = true + elseif is_host("linux", "macosx") then + local gcc = find_tool("gcc", {version = true}) + local clang = find_tool("clang", {version = true}) + if clang and clang.version and semver.compare(clang.version, "14.0") >= 0 then + test = true + elseif gcc and gcc.version and semver.compare(gcc.version, "11.0") >= 0 then + test = true + end + end + if test then + os.exec("xmake") + end +end diff --git a/tests/projects/c++/modules/dependence2/test.lua b/tests/projects/c++/modules/dependence2/test.lua new file mode 100644 index 000000000..76b141d6b --- /dev/null +++ b/tests/projects/c++/modules/dependence2/test.lua @@ -0,0 +1,20 @@ +import("lib.detect.find_tool") +import("core.base.semver") + +function main(t) + local test = false + if is_subhost("windows") then + test = true + elseif is_host("linux", "macosx") then + local gcc = find_tool("gcc", {version = true}) + local clang = find_tool("clang", {version = true}) + if clang and clang.version and semver.compare(clang.version, "14.0") >= 0 then + test = true + elseif gcc and gcc.version and semver.compare(gcc.version, "11.0") >= 0 then + test = true + end + end + if test then + os.exec("xmake") + end +end diff --git a/tests/projects/c++/modules/hello with spaces/test.lua b/tests/projects/c++/modules/hello with spaces/test.lua new file mode 100644 index 000000000..76b141d6b --- /dev/null +++ b/tests/projects/c++/modules/hello with spaces/test.lua @@ -0,0 +1,20 @@ +import("lib.detect.find_tool") +import("core.base.semver") + +function main(t) + local test = false + if is_subhost("windows") then + test = true + elseif is_host("linux", "macosx") then + local gcc = find_tool("gcc", {version = true}) + local clang = find_tool("clang", {version = true}) + if clang and clang.version and semver.compare(clang.version, "14.0") >= 0 then + test = true + elseif gcc and gcc.version and semver.compare(gcc.version, "11.0") >= 0 then + test = true + end + end + if test then + os.exec("xmake") + end +end diff --git a/tests/projects/c++/modules/hello/test.lua b/tests/projects/c++/modules/hello/test.lua new file mode 100644 index 000000000..76b141d6b --- /dev/null +++ b/tests/projects/c++/modules/hello/test.lua @@ -0,0 +1,20 @@ +import("lib.detect.find_tool") +import("core.base.semver") + +function main(t) + local test = false + if is_subhost("windows") then + test = true + elseif is_host("linux", "macosx") then + local gcc = find_tool("gcc", {version = true}) + local clang = find_tool("clang", {version = true}) + if clang and clang.version and semver.compare(clang.version, "14.0") >= 0 then + test = true + elseif gcc and gcc.version and semver.compare(gcc.version, "11.0") >= 0 then + test = true + end + end + if test then + os.exec("xmake") + end +end diff --git a/tests/projects/c++/modules/impl_unit/test.lua b/tests/projects/c++/modules/impl_unit/test.lua new file mode 100644 index 000000000..76b141d6b --- /dev/null +++ b/tests/projects/c++/modules/impl_unit/test.lua @@ -0,0 +1,20 @@ +import("lib.detect.find_tool") +import("core.base.semver") + +function main(t) + local test = false + if is_subhost("windows") then + test = true + elseif is_host("linux", "macosx") then + local gcc = find_tool("gcc", {version = true}) + local clang = find_tool("clang", {version = true}) + if clang and clang.version and semver.compare(clang.version, "14.0") >= 0 then + test = true + elseif gcc and gcc.version and semver.compare(gcc.version, "11.0") >= 0 then + test = true + end + end + if test then + os.exec("xmake") + end +end diff --git a/tests/projects/c++/modules/inline_and_template/test.lua b/tests/projects/c++/modules/inline_and_template/test.lua new file mode 100644 index 000000000..76b141d6b --- /dev/null +++ b/tests/projects/c++/modules/inline_and_template/test.lua @@ -0,0 +1,20 @@ +import("lib.detect.find_tool") +import("core.base.semver") + +function main(t) + local test = false + if is_subhost("windows") then + test = true + elseif is_host("linux", "macosx") then + local gcc = find_tool("gcc", {version = true}) + local clang = find_tool("clang", {version = true}) + if clang and clang.version and semver.compare(clang.version, "14.0") >= 0 then + test = true + elseif gcc and gcc.version and semver.compare(gcc.version, "11.0") >= 0 then + test = true + end + end + if test then + os.exec("xmake") + end +end diff --git a/tests/projects/c++/modules/staticlib/test.lua b/tests/projects/c++/modules/staticlib/test.lua new file mode 100644 index 000000000..76b141d6b --- /dev/null +++ b/tests/projects/c++/modules/staticlib/test.lua @@ -0,0 +1,20 @@ +import("lib.detect.find_tool") +import("core.base.semver") + +function main(t) + local test = false + if is_subhost("windows") then + test = true + elseif is_host("linux", "macosx") then + local gcc = find_tool("gcc", {version = true}) + local clang = find_tool("clang", {version = true}) + if clang and clang.version and semver.compare(clang.version, "14.0") >= 0 then + test = true + elseif gcc and gcc.version and semver.compare(gcc.version, "11.0") >= 0 then + test = true + end + end + if test then + os.exec("xmake") + end +end diff --git a/tests/projects/c++/modules/submodules/test.lua b/tests/projects/c++/modules/submodules/test.lua new file mode 100644 index 000000000..76b141d6b --- /dev/null +++ b/tests/projects/c++/modules/submodules/test.lua @@ -0,0 +1,20 @@ +import("lib.detect.find_tool") +import("core.base.semver") + +function main(t) + local test = false + if is_subhost("windows") then + test = true + elseif is_host("linux", "macosx") then + local gcc = find_tool("gcc", {version = true}) + local clang = find_tool("clang", {version = true}) + if clang and clang.version and semver.compare(clang.version, "14.0") >= 0 then + test = true + elseif gcc and gcc.version and semver.compare(gcc.version, "11.0") >= 0 then + test = true + end + end + if test then + os.exec("xmake") + end +end diff --git a/tests/projects/c++/modules/submodules2/test.lua b/tests/projects/c++/modules/submodules2/test.lua new file mode 100644 index 000000000..76b141d6b --- /dev/null +++ b/tests/projects/c++/modules/submodules2/test.lua @@ -0,0 +1,20 @@ +import("lib.detect.find_tool") +import("core.base.semver") + +function main(t) + local test = false + if is_subhost("windows") then + test = true + elseif is_host("linux", "macosx") then + local gcc = find_tool("gcc", {version = true}) + local clang = find_tool("clang", {version = true}) + if clang and clang.version and semver.compare(clang.version, "14.0") >= 0 then + test = true + elseif gcc and gcc.version and semver.compare(gcc.version, "11.0") >= 0 then + test = true + end + end + if test then + os.exec("xmake") + end +end -- cgit v1.3.1 From c6ee1e60c83626215ba3f1bf8471fcc72ab3d4b4 Mon Sep 17 00:00:00 2001 From: ruki Date: Mon, 8 Aug 2022 21:01:10 +0800 Subject: fix tests --- tests/projects/c++/modules/class/test.lua | 8 +++++--- tests/projects/c++/modules/cpp_with_moduledeps/test.lua | 8 +++++--- tests/projects/c++/modules/dependence/test.lua | 8 +++++--- tests/projects/c++/modules/dependence2/test.lua | 8 +++++--- tests/projects/c++/modules/hello with spaces/test.lua | 8 +++++--- tests/projects/c++/modules/hello/test.lua | 8 +++++--- tests/projects/c++/modules/impl_unit/test.lua | 8 +++++--- tests/projects/c++/modules/inline_and_template/test.lua | 8 +++++--- tests/projects/c++/modules/staticlib/test.lua | 8 +++++--- tests/projects/c++/modules/submodules/test.lua | 8 +++++--- tests/projects/c++/modules/submodules2/test.lua | 8 +++++--- 11 files changed, 55 insertions(+), 33 deletions(-) (limited to 'tests/projects/c++/modules/inline_and_template') diff --git a/tests/projects/c++/modules/class/test.lua b/tests/projects/c++/modules/class/test.lua index 76b141d6b..b2cc5b3da 100644 --- a/tests/projects/c++/modules/class/test.lua +++ b/tests/projects/c++/modules/class/test.lua @@ -5,13 +5,15 @@ function main(t) local test = false if is_subhost("windows") then test = true - elseif is_host("linux", "macosx") then + elseif is_host("linux") then local gcc = find_tool("gcc", {version = true}) + if gcc and gcc.version and semver.compare(gcc.version, "11.0") >= 0 then + test = true + end + elseif is_host("macosx") then local clang = find_tool("clang", {version = true}) if clang and clang.version and semver.compare(clang.version, "14.0") >= 0 then test = true - elseif gcc and gcc.version and semver.compare(gcc.version, "11.0") >= 0 then - test = true end end if test then diff --git a/tests/projects/c++/modules/cpp_with_moduledeps/test.lua b/tests/projects/c++/modules/cpp_with_moduledeps/test.lua index 76b141d6b..b2cc5b3da 100644 --- a/tests/projects/c++/modules/cpp_with_moduledeps/test.lua +++ b/tests/projects/c++/modules/cpp_with_moduledeps/test.lua @@ -5,13 +5,15 @@ function main(t) local test = false if is_subhost("windows") then test = true - elseif is_host("linux", "macosx") then + elseif is_host("linux") then local gcc = find_tool("gcc", {version = true}) + if gcc and gcc.version and semver.compare(gcc.version, "11.0") >= 0 then + test = true + end + elseif is_host("macosx") then local clang = find_tool("clang", {version = true}) if clang and clang.version and semver.compare(clang.version, "14.0") >= 0 then test = true - elseif gcc and gcc.version and semver.compare(gcc.version, "11.0") >= 0 then - test = true end end if test then diff --git a/tests/projects/c++/modules/dependence/test.lua b/tests/projects/c++/modules/dependence/test.lua index 76b141d6b..b2cc5b3da 100644 --- a/tests/projects/c++/modules/dependence/test.lua +++ b/tests/projects/c++/modules/dependence/test.lua @@ -5,13 +5,15 @@ function main(t) local test = false if is_subhost("windows") then test = true - elseif is_host("linux", "macosx") then + elseif is_host("linux") then local gcc = find_tool("gcc", {version = true}) + if gcc and gcc.version and semver.compare(gcc.version, "11.0") >= 0 then + test = true + end + elseif is_host("macosx") then local clang = find_tool("clang", {version = true}) if clang and clang.version and semver.compare(clang.version, "14.0") >= 0 then test = true - elseif gcc and gcc.version and semver.compare(gcc.version, "11.0") >= 0 then - test = true end end if test then diff --git a/tests/projects/c++/modules/dependence2/test.lua b/tests/projects/c++/modules/dependence2/test.lua index 76b141d6b..b2cc5b3da 100644 --- a/tests/projects/c++/modules/dependence2/test.lua +++ b/tests/projects/c++/modules/dependence2/test.lua @@ -5,13 +5,15 @@ function main(t) local test = false if is_subhost("windows") then test = true - elseif is_host("linux", "macosx") then + elseif is_host("linux") then local gcc = find_tool("gcc", {version = true}) + if gcc and gcc.version and semver.compare(gcc.version, "11.0") >= 0 then + test = true + end + elseif is_host("macosx") then local clang = find_tool("clang", {version = true}) if clang and clang.version and semver.compare(clang.version, "14.0") >= 0 then test = true - elseif gcc and gcc.version and semver.compare(gcc.version, "11.0") >= 0 then - test = true end end if test then diff --git a/tests/projects/c++/modules/hello with spaces/test.lua b/tests/projects/c++/modules/hello with spaces/test.lua index 76b141d6b..b2cc5b3da 100644 --- a/tests/projects/c++/modules/hello with spaces/test.lua +++ b/tests/projects/c++/modules/hello with spaces/test.lua @@ -5,13 +5,15 @@ function main(t) local test = false if is_subhost("windows") then test = true - elseif is_host("linux", "macosx") then + elseif is_host("linux") then local gcc = find_tool("gcc", {version = true}) + if gcc and gcc.version and semver.compare(gcc.version, "11.0") >= 0 then + test = true + end + elseif is_host("macosx") then local clang = find_tool("clang", {version = true}) if clang and clang.version and semver.compare(clang.version, "14.0") >= 0 then test = true - elseif gcc and gcc.version and semver.compare(gcc.version, "11.0") >= 0 then - test = true end end if test then diff --git a/tests/projects/c++/modules/hello/test.lua b/tests/projects/c++/modules/hello/test.lua index 76b141d6b..b2cc5b3da 100644 --- a/tests/projects/c++/modules/hello/test.lua +++ b/tests/projects/c++/modules/hello/test.lua @@ -5,13 +5,15 @@ function main(t) local test = false if is_subhost("windows") then test = true - elseif is_host("linux", "macosx") then + elseif is_host("linux") then local gcc = find_tool("gcc", {version = true}) + if gcc and gcc.version and semver.compare(gcc.version, "11.0") >= 0 then + test = true + end + elseif is_host("macosx") then local clang = find_tool("clang", {version = true}) if clang and clang.version and semver.compare(clang.version, "14.0") >= 0 then test = true - elseif gcc and gcc.version and semver.compare(gcc.version, "11.0") >= 0 then - test = true end end if test then diff --git a/tests/projects/c++/modules/impl_unit/test.lua b/tests/projects/c++/modules/impl_unit/test.lua index 76b141d6b..b2cc5b3da 100644 --- a/tests/projects/c++/modules/impl_unit/test.lua +++ b/tests/projects/c++/modules/impl_unit/test.lua @@ -5,13 +5,15 @@ function main(t) local test = false if is_subhost("windows") then test = true - elseif is_host("linux", "macosx") then + elseif is_host("linux") then local gcc = find_tool("gcc", {version = true}) + if gcc and gcc.version and semver.compare(gcc.version, "11.0") >= 0 then + test = true + end + elseif is_host("macosx") then local clang = find_tool("clang", {version = true}) if clang and clang.version and semver.compare(clang.version, "14.0") >= 0 then test = true - elseif gcc and gcc.version and semver.compare(gcc.version, "11.0") >= 0 then - test = true end end if test then diff --git a/tests/projects/c++/modules/inline_and_template/test.lua b/tests/projects/c++/modules/inline_and_template/test.lua index 76b141d6b..b2cc5b3da 100644 --- a/tests/projects/c++/modules/inline_and_template/test.lua +++ b/tests/projects/c++/modules/inline_and_template/test.lua @@ -5,13 +5,15 @@ function main(t) local test = false if is_subhost("windows") then test = true - elseif is_host("linux", "macosx") then + elseif is_host("linux") then local gcc = find_tool("gcc", {version = true}) + if gcc and gcc.version and semver.compare(gcc.version, "11.0") >= 0 then + test = true + end + elseif is_host("macosx") then local clang = find_tool("clang", {version = true}) if clang and clang.version and semver.compare(clang.version, "14.0") >= 0 then test = true - elseif gcc and gcc.version and semver.compare(gcc.version, "11.0") >= 0 then - test = true end end if test then diff --git a/tests/projects/c++/modules/staticlib/test.lua b/tests/projects/c++/modules/staticlib/test.lua index 76b141d6b..b2cc5b3da 100644 --- a/tests/projects/c++/modules/staticlib/test.lua +++ b/tests/projects/c++/modules/staticlib/test.lua @@ -5,13 +5,15 @@ function main(t) local test = false if is_subhost("windows") then test = true - elseif is_host("linux", "macosx") then + elseif is_host("linux") then local gcc = find_tool("gcc", {version = true}) + if gcc and gcc.version and semver.compare(gcc.version, "11.0") >= 0 then + test = true + end + elseif is_host("macosx") then local clang = find_tool("clang", {version = true}) if clang and clang.version and semver.compare(clang.version, "14.0") >= 0 then test = true - elseif gcc and gcc.version and semver.compare(gcc.version, "11.0") >= 0 then - test = true end end if test then diff --git a/tests/projects/c++/modules/submodules/test.lua b/tests/projects/c++/modules/submodules/test.lua index 76b141d6b..b2cc5b3da 100644 --- a/tests/projects/c++/modules/submodules/test.lua +++ b/tests/projects/c++/modules/submodules/test.lua @@ -5,13 +5,15 @@ function main(t) local test = false if is_subhost("windows") then test = true - elseif is_host("linux", "macosx") then + elseif is_host("linux") then local gcc = find_tool("gcc", {version = true}) + if gcc and gcc.version and semver.compare(gcc.version, "11.0") >= 0 then + test = true + end + elseif is_host("macosx") then local clang = find_tool("clang", {version = true}) if clang and clang.version and semver.compare(clang.version, "14.0") >= 0 then test = true - elseif gcc and gcc.version and semver.compare(gcc.version, "11.0") >= 0 then - test = true end end if test then diff --git a/tests/projects/c++/modules/submodules2/test.lua b/tests/projects/c++/modules/submodules2/test.lua index 76b141d6b..b2cc5b3da 100644 --- a/tests/projects/c++/modules/submodules2/test.lua +++ b/tests/projects/c++/modules/submodules2/test.lua @@ -5,13 +5,15 @@ function main(t) local test = false if is_subhost("windows") then test = true - elseif is_host("linux", "macosx") then + elseif is_host("linux") then local gcc = find_tool("gcc", {version = true}) + if gcc and gcc.version and semver.compare(gcc.version, "11.0") >= 0 then + test = true + end + elseif is_host("macosx") then local clang = find_tool("clang", {version = true}) if clang and clang.version and semver.compare(clang.version, "14.0") >= 0 then test = true - elseif gcc and gcc.version and semver.compare(gcc.version, "11.0") >= 0 then - test = true end end if test then -- cgit v1.3.1 From ebaa26b0153d68a0f8cee6e135793fd079cca5f4 Mon Sep 17 00:00:00 2001 From: ruki Date: Tue, 9 Aug 2022 22:58:25 +0800 Subject: improve test --- tests/projects/c++/modules/class/test.lua | 23 +----------- .../c++/modules/cpp_with_moduledeps/test.lua | 23 +----------- .../projects/c++/modules/dependence/CMakeLists.txt | 43 ++++++++++++++++++++++ tests/projects/c++/modules/dependence/test.lua | 23 +----------- tests/projects/c++/modules/dependence2/test.lua | 23 +----------- .../c++/modules/hello with spaces/test.lua | 23 +----------- tests/projects/c++/modules/hello/test.lua | 23 +----------- tests/projects/c++/modules/impl_unit/test.lua | 23 +----------- .../c++/modules/inline_and_template/test.lua | 23 +----------- tests/projects/c++/modules/staticlib/test.lua | 23 +----------- tests/projects/c++/modules/submodules/test.lua | 23 +----------- tests/projects/c++/modules/submodules2/test.lua | 23 +----------- tests/projects/c++/modules/test_base.lua | 21 +++++++++++ 13 files changed, 75 insertions(+), 242 deletions(-) create mode 100644 tests/projects/c++/modules/dependence/CMakeLists.txt create mode 100644 tests/projects/c++/modules/test_base.lua (limited to 'tests/projects/c++/modules/inline_and_template') diff --git a/tests/projects/c++/modules/class/test.lua b/tests/projects/c++/modules/class/test.lua index b2cc5b3da..7717f8049 100644 --- a/tests/projects/c++/modules/class/test.lua +++ b/tests/projects/c++/modules/class/test.lua @@ -1,22 +1 @@ -import("lib.detect.find_tool") -import("core.base.semver") - -function main(t) - local test = false - if is_subhost("windows") then - test = true - elseif is_host("linux") then - local gcc = find_tool("gcc", {version = true}) - if gcc and gcc.version and semver.compare(gcc.version, "11.0") >= 0 then - test = true - end - elseif is_host("macosx") then - local clang = find_tool("clang", {version = true}) - if clang and clang.version and semver.compare(clang.version, "14.0") >= 0 then - test = true - end - end - if test then - os.exec("xmake") - end -end +inherit(".test_base") diff --git a/tests/projects/c++/modules/cpp_with_moduledeps/test.lua b/tests/projects/c++/modules/cpp_with_moduledeps/test.lua index b2cc5b3da..7717f8049 100644 --- a/tests/projects/c++/modules/cpp_with_moduledeps/test.lua +++ b/tests/projects/c++/modules/cpp_with_moduledeps/test.lua @@ -1,22 +1 @@ -import("lib.detect.find_tool") -import("core.base.semver") - -function main(t) - local test = false - if is_subhost("windows") then - test = true - elseif is_host("linux") then - local gcc = find_tool("gcc", {version = true}) - if gcc and gcc.version and semver.compare(gcc.version, "11.0") >= 0 then - test = true - end - elseif is_host("macosx") then - local clang = find_tool("clang", {version = true}) - if clang and clang.version and semver.compare(clang.version, "14.0") >= 0 then - test = true - end - end - if test then - os.exec("xmake") - end -end +inherit(".test_base") diff --git a/tests/projects/c++/modules/dependence/CMakeLists.txt b/tests/projects/c++/modules/dependence/CMakeLists.txt new file mode 100644 index 000000000..19eb7793a --- /dev/null +++ b/tests/projects/c++/modules/dependence/CMakeLists.txt @@ -0,0 +1,43 @@ +# this is the build file for project +# it is autogenerated by the xmake build system. +# do not edit by hand. + +# project +cmake_minimum_required(VERSION 3.15.0) +cmake_policy(SET CMP0091 NEW) +project(dependence LANGUAGES CXX C) + +# target +add_executable(dependence "") +set_target_properties(dependence PROPERTIES OUTPUT_NAME "dependence") +set_target_properties(dependence PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/build/macosx/x86_64/release") +target_compile_options(dependence PRIVATE + $<$:-m64> + $<$:-m64> + $<$:-isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.3.sdk> + $<$:-isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.3.sdk> + $<$:-fmodules> + $<$:-fbuiltin-module-map> + $<$:-fimplicit-modules> + $<$:-fno-implicit-module-maps> +) +target_compile_features(dependence PRIVATE cxx_std_20) +if(MSVC) + set_property(TARGET dependence PROPERTY + MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") +endif() +target_link_options(dependence PRIVATE + -m64 + -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.3.sdk +) +target_sources(dependence PRIVATE + src/hello_impl.cpp + src/mod_impl.cpp + src/main.cpp + src/hello_impl.cpp + src/mod_impl.cpp + src/main.cpp + src/mod.mpp + src/hello.mpp +) + diff --git a/tests/projects/c++/modules/dependence/test.lua b/tests/projects/c++/modules/dependence/test.lua index b2cc5b3da..7717f8049 100644 --- a/tests/projects/c++/modules/dependence/test.lua +++ b/tests/projects/c++/modules/dependence/test.lua @@ -1,22 +1 @@ -import("lib.detect.find_tool") -import("core.base.semver") - -function main(t) - local test = false - if is_subhost("windows") then - test = true - elseif is_host("linux") then - local gcc = find_tool("gcc", {version = true}) - if gcc and gcc.version and semver.compare(gcc.version, "11.0") >= 0 then - test = true - end - elseif is_host("macosx") then - local clang = find_tool("clang", {version = true}) - if clang and clang.version and semver.compare(clang.version, "14.0") >= 0 then - test = true - end - end - if test then - os.exec("xmake") - end -end +inherit(".test_base") diff --git a/tests/projects/c++/modules/dependence2/test.lua b/tests/projects/c++/modules/dependence2/test.lua index b2cc5b3da..7717f8049 100644 --- a/tests/projects/c++/modules/dependence2/test.lua +++ b/tests/projects/c++/modules/dependence2/test.lua @@ -1,22 +1 @@ -import("lib.detect.find_tool") -import("core.base.semver") - -function main(t) - local test = false - if is_subhost("windows") then - test = true - elseif is_host("linux") then - local gcc = find_tool("gcc", {version = true}) - if gcc and gcc.version and semver.compare(gcc.version, "11.0") >= 0 then - test = true - end - elseif is_host("macosx") then - local clang = find_tool("clang", {version = true}) - if clang and clang.version and semver.compare(clang.version, "14.0") >= 0 then - test = true - end - end - if test then - os.exec("xmake") - end -end +inherit(".test_base") diff --git a/tests/projects/c++/modules/hello with spaces/test.lua b/tests/projects/c++/modules/hello with spaces/test.lua index b2cc5b3da..7717f8049 100644 --- a/tests/projects/c++/modules/hello with spaces/test.lua +++ b/tests/projects/c++/modules/hello with spaces/test.lua @@ -1,22 +1 @@ -import("lib.detect.find_tool") -import("core.base.semver") - -function main(t) - local test = false - if is_subhost("windows") then - test = true - elseif is_host("linux") then - local gcc = find_tool("gcc", {version = true}) - if gcc and gcc.version and semver.compare(gcc.version, "11.0") >= 0 then - test = true - end - elseif is_host("macosx") then - local clang = find_tool("clang", {version = true}) - if clang and clang.version and semver.compare(clang.version, "14.0") >= 0 then - test = true - end - end - if test then - os.exec("xmake") - end -end +inherit(".test_base") diff --git a/tests/projects/c++/modules/hello/test.lua b/tests/projects/c++/modules/hello/test.lua index b2cc5b3da..7717f8049 100644 --- a/tests/projects/c++/modules/hello/test.lua +++ b/tests/projects/c++/modules/hello/test.lua @@ -1,22 +1 @@ -import("lib.detect.find_tool") -import("core.base.semver") - -function main(t) - local test = false - if is_subhost("windows") then - test = true - elseif is_host("linux") then - local gcc = find_tool("gcc", {version = true}) - if gcc and gcc.version and semver.compare(gcc.version, "11.0") >= 0 then - test = true - end - elseif is_host("macosx") then - local clang = find_tool("clang", {version = true}) - if clang and clang.version and semver.compare(clang.version, "14.0") >= 0 then - test = true - end - end - if test then - os.exec("xmake") - end -end +inherit(".test_base") diff --git a/tests/projects/c++/modules/impl_unit/test.lua b/tests/projects/c++/modules/impl_unit/test.lua index b2cc5b3da..7717f8049 100644 --- a/tests/projects/c++/modules/impl_unit/test.lua +++ b/tests/projects/c++/modules/impl_unit/test.lua @@ -1,22 +1 @@ -import("lib.detect.find_tool") -import("core.base.semver") - -function main(t) - local test = false - if is_subhost("windows") then - test = true - elseif is_host("linux") then - local gcc = find_tool("gcc", {version = true}) - if gcc and gcc.version and semver.compare(gcc.version, "11.0") >= 0 then - test = true - end - elseif is_host("macosx") then - local clang = find_tool("clang", {version = true}) - if clang and clang.version and semver.compare(clang.version, "14.0") >= 0 then - test = true - end - end - if test then - os.exec("xmake") - end -end +inherit(".test_base") diff --git a/tests/projects/c++/modules/inline_and_template/test.lua b/tests/projects/c++/modules/inline_and_template/test.lua index b2cc5b3da..7717f8049 100644 --- a/tests/projects/c++/modules/inline_and_template/test.lua +++ b/tests/projects/c++/modules/inline_and_template/test.lua @@ -1,22 +1 @@ -import("lib.detect.find_tool") -import("core.base.semver") - -function main(t) - local test = false - if is_subhost("windows") then - test = true - elseif is_host("linux") then - local gcc = find_tool("gcc", {version = true}) - if gcc and gcc.version and semver.compare(gcc.version, "11.0") >= 0 then - test = true - end - elseif is_host("macosx") then - local clang = find_tool("clang", {version = true}) - if clang and clang.version and semver.compare(clang.version, "14.0") >= 0 then - test = true - end - end - if test then - os.exec("xmake") - end -end +inherit(".test_base") diff --git a/tests/projects/c++/modules/staticlib/test.lua b/tests/projects/c++/modules/staticlib/test.lua index b2cc5b3da..7717f8049 100644 --- a/tests/projects/c++/modules/staticlib/test.lua +++ b/tests/projects/c++/modules/staticlib/test.lua @@ -1,22 +1 @@ -import("lib.detect.find_tool") -import("core.base.semver") - -function main(t) - local test = false - if is_subhost("windows") then - test = true - elseif is_host("linux") then - local gcc = find_tool("gcc", {version = true}) - if gcc and gcc.version and semver.compare(gcc.version, "11.0") >= 0 then - test = true - end - elseif is_host("macosx") then - local clang = find_tool("clang", {version = true}) - if clang and clang.version and semver.compare(clang.version, "14.0") >= 0 then - test = true - end - end - if test then - os.exec("xmake") - end -end +inherit(".test_base") diff --git a/tests/projects/c++/modules/submodules/test.lua b/tests/projects/c++/modules/submodules/test.lua index b2cc5b3da..7717f8049 100644 --- a/tests/projects/c++/modules/submodules/test.lua +++ b/tests/projects/c++/modules/submodules/test.lua @@ -1,22 +1 @@ -import("lib.detect.find_tool") -import("core.base.semver") - -function main(t) - local test = false - if is_subhost("windows") then - test = true - elseif is_host("linux") then - local gcc = find_tool("gcc", {version = true}) - if gcc and gcc.version and semver.compare(gcc.version, "11.0") >= 0 then - test = true - end - elseif is_host("macosx") then - local clang = find_tool("clang", {version = true}) - if clang and clang.version and semver.compare(clang.version, "14.0") >= 0 then - test = true - end - end - if test then - os.exec("xmake") - end -end +inherit(".test_base") diff --git a/tests/projects/c++/modules/submodules2/test.lua b/tests/projects/c++/modules/submodules2/test.lua index b2cc5b3da..7717f8049 100644 --- a/tests/projects/c++/modules/submodules2/test.lua +++ b/tests/projects/c++/modules/submodules2/test.lua @@ -1,22 +1 @@ -import("lib.detect.find_tool") -import("core.base.semver") - -function main(t) - local test = false - if is_subhost("windows") then - test = true - elseif is_host("linux") then - local gcc = find_tool("gcc", {version = true}) - if gcc and gcc.version and semver.compare(gcc.version, "11.0") >= 0 then - test = true - end - elseif is_host("macosx") then - local clang = find_tool("clang", {version = true}) - if clang and clang.version and semver.compare(clang.version, "14.0") >= 0 then - test = true - end - end - if test then - os.exec("xmake") - end -end +inherit(".test_base") diff --git a/tests/projects/c++/modules/test_base.lua b/tests/projects/c++/modules/test_base.lua new file mode 100644 index 000000000..68efbeaa0 --- /dev/null +++ b/tests/projects/c++/modules/test_base.lua @@ -0,0 +1,21 @@ +import("lib.detect.find_tool") +import("core.base.semver") + +function main(t) + if is_subhost("windows") then + os.exec("xmake f -c") + os.exec("xmake -r") + elseif is_host("linux") then + local gcc = find_tool("gcc", {version = true}) + if gcc and gcc.version and semver.compare(gcc.version, "11.0") >= 0 then + os.exec("xmake f -c") + os.exec("xmake -r") + end + local clang = find_tool("clang", {version = true}) + if clang and clang.version and semver.compare(clang.version, "14.0") >= 0 then + os.exec("xmake clean -a") + os.exec("xmake f --toolchain=clang -c") + os.exec("xmake -r") + end + end +end -- cgit v1.3.1