diff options
| -rw-r--r-- | tests/projects/c++/modules/stl_headerunit/test.lua | 1 | ||||
| -rw-r--r-- | tests/projects/c++/modules/test_base.lua | 15 | ||||
| -rw-r--r-- | tests/projects/c++/modules/test_headerunits.lua | 34 | ||||
| -rw-r--r-- | tests/projects/c++/modules/user_headerunit/test.lua | 1 |
4 files changed, 48 insertions, 3 deletions
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") |