From b40cc4227ce6d4c491d592b361843a42232cd33d Mon Sep 17 00:00:00 2001 From: Arthur LAURENT Date: Sat, 3 Feb 2024 16:39:33 +0100 Subject: improve tests --- tests/projects/c++/modules/test_base.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (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 index c4252d41c..e6f46764a 100644 --- a/tests/projects/c++/modules/test_base.lua +++ b/tests/projects/c++/modules/test_base.lua @@ -1,9 +1,9 @@ import("lib.detect.find_tool") import("core.base.semver") +import("utils.ci.is_running", {alias = "ci_is_running"}) function _build() - local ci = (os.getenv("CI") or os.getenv("GITHUB_ACTIONS") or ""):lower() - if ci == "true" then + if ci_is_running() then os.exec("xmake -rvD") else os.exec("xmake -r") -- cgit v1.3.1 From 2d59e22d8cbf7ec4405f80ad38d6b836cc125875 Mon Sep 17 00:00:00 2001 From: Arthur LAURENT Date: Sat, 3 Feb 2024 17:39:56 +0100 Subject: fix tests --- tests/projects/c++/modules/circular_dependency/test.lua | 2 +- tests/projects/c++/modules/test_base.lua | 4 ++-- tests/projects/c++/modules/test_headerunits.lua | 4 ++-- tests/projects/c++/modules/test_stdmodules.lua | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) (limited to 'tests/projects/c++/modules/test_base.lua') diff --git a/tests/projects/c++/modules/circular_dependency/test.lua b/tests/projects/c++/modules/circular_dependency/test.lua index 14f82051a..fc20e469c 100644 --- a/tests/projects/c++/modules/circular_dependency/test.lua +++ b/tests/projects/c++/modules/circular_dependency/test.lua @@ -1,5 +1,5 @@ import(".test_base", {alias = "test_build"}) function main(t) - t:will_raise(test_build, "error: circular modules dependency detected!") + t:will_raise(test_build, "circular modules dependency detected") end diff --git a/tests/projects/c++/modules/test_base.lua b/tests/projects/c++/modules/test_base.lua index e6f46764a..4c972c7b6 100644 --- a/tests/projects/c++/modules/test_base.lua +++ b/tests/projects/c++/modules/test_base.lua @@ -4,9 +4,9 @@ import("utils.ci.is_running", {alias = "ci_is_running"}) function _build() if ci_is_running() then - os.exec("xmake -rvD") + os.run("xmake -rvD") else - os.exec("xmake -r") + os.run("xmake -r") end end diff --git a/tests/projects/c++/modules/test_headerunits.lua b/tests/projects/c++/modules/test_headerunits.lua index 05d7463ea..bb32070cf 100644 --- a/tests/projects/c++/modules/test_headerunits.lua +++ b/tests/projects/c++/modules/test_headerunits.lua @@ -5,9 +5,9 @@ import("utils.ci.is_running", {alias = "ci_is_running"}) function _build() if ci_is_running() then - os.exec("xmake -rvD") + os.run("xmake -rvD") else - os.exec("xmake -r") + os.run("xmake -r") end end diff --git a/tests/projects/c++/modules/test_stdmodules.lua b/tests/projects/c++/modules/test_stdmodules.lua index b70ff6bbb..68a5922ef 100644 --- a/tests/projects/c++/modules/test_stdmodules.lua +++ b/tests/projects/c++/modules/test_stdmodules.lua @@ -5,9 +5,9 @@ import("utils.ci.is_running", {alias = "ci_is_running"}) function _build() if ci_is_running() then - os.exec("xmake -rvD") + os.run("xmake -rvD") else - os.exec("xmake -r") + os.run("xmake -r") end end -- cgit v1.3.1 From 794f6db0adafe26f041d31594cc7e516017ede39 Mon Sep 17 00:00:00 2001 From: ruki Date: Sun, 4 Feb 2024 09:26:34 +0800 Subject: Update test_base.lua --- tests/projects/c++/modules/test_base.lua | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (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 index 4c972c7b6..092fbd72f 100644 --- a/tests/projects/c++/modules/test_base.lua +++ b/tests/projects/c++/modules/test_base.lua @@ -10,6 +10,23 @@ function _build() end end +function can_build() + if is_subhost("windows") then + return true + elseif is_subhost("msys") then + return 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 + return true + end + local clang = find_tool("clang", {version = true}) + if clang and clang.version and semver.compare(clang.version, "14.0") >= 0 then + return true + end + end +end + function main(t) if is_subhost("windows") then local clang = find_tool("clang", {version = true}) -- cgit v1.3.1