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/test_base.lua | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 tests/projects/c++/modules/test_base.lua (limited to 'tests/projects/c++/modules/test_base.lua') 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 From 2723282a4fd0af130ac5d65c5b40fa12f7ce803f Mon Sep 17 00:00:00 2001 From: ruki Date: Fri, 12 Aug 2022 22:32:57 +0800 Subject: improve tests for cxxmodules --- tests/projects/c++/modules/stl_headerunit/test.lua | 1 + tests/projects/c++/modules/test_base.lua | 15 ++++++++-- tests/projects/c++/modules/test_headerunits.lua | 34 ++++++++++++++++++++++ .../projects/c++/modules/user_headerunit/test.lua | 1 + 4 files changed, 48 insertions(+), 3 deletions(-) create mode 100644 tests/projects/c++/modules/stl_headerunit/test.lua create mode 100644 tests/projects/c++/modules/test_headerunits.lua create mode 100644 tests/projects/c++/modules/user_headerunit/test.lua (limited to 'tests/projects/c++/modules/test_base.lua') diff --git a/tests/projects/c++/modules/stl_headerunit/test.lua b/tests/projects/c++/modules/stl_headerunit/test.lua new file mode 100644 index 000000000..c18e5a1d0 --- /dev/null +++ b/tests/projects/c++/modules/stl_headerunit/test.lua @@ -0,0 +1 @@ +inherit(".test_headerunits") diff --git a/tests/projects/c++/modules/test_base.lua b/tests/projects/c++/modules/test_base.lua index 68efbeaa0..4aee9f8e7 100644 --- a/tests/projects/c++/modules/test_base.lua +++ b/tests/projects/c++/modules/test_base.lua @@ -1,21 +1,30 @@ import("lib.detect.find_tool") import("core.base.semver") +function _build() + local ci = (os.getenv("CI") or os.getenv("GITHUB_ACTIONS") or ""):lower() + if ci == "true" then + os.exec("xmake -rvD") + else + os.exec("xmake -r") + end +end + function main(t) if is_subhost("windows") then os.exec("xmake f -c") - os.exec("xmake -r") + _build() 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") + _build() 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") + _build() end end end diff --git a/tests/projects/c++/modules/test_headerunits.lua b/tests/projects/c++/modules/test_headerunits.lua new file mode 100644 index 000000000..905812c14 --- /dev/null +++ b/tests/projects/c++/modules/test_headerunits.lua @@ -0,0 +1,34 @@ +import("lib.detect.find_tool") +import("core.base.semver") +import("detect.sdks.find_vstudio") + +function _build() + local ci = (os.getenv("CI") or os.getenv("GITHUB_ACTIONS") or ""):lower() + if ci == "true" then + os.exec("xmake -rvD") + else + os.exec("xmake -r") + end +end + +function main(t) + if is_subhost("windows") then + local vs = find_vstudio() + if vs and vs["2022"] then + os.exec("xmake f -c") + _build() + end + 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") + _build() + end + local clang = find_tool("clang", {version = true}) + if clang and clang.version and semver.compare(clang.version, "16.0") >= 0 then + os.exec("xmake clean -a") + os.exec("xmake f --toolchain=clang -c") + _build() + end + end +end diff --git a/tests/projects/c++/modules/user_headerunit/test.lua b/tests/projects/c++/modules/user_headerunit/test.lua new file mode 100644 index 000000000..c18e5a1d0 --- /dev/null +++ b/tests/projects/c++/modules/user_headerunit/test.lua @@ -0,0 +1 @@ +inherit(".test_headerunits") -- cgit v1.3.1