improve culling tests

5 files changed, 87 insertions, 2 deletions

diff --git a/tests/projects/c++/modules/culling/test.lua b/tests/projects/c++/modules/culling/test.lua
index 91c19553c..bc72c4add 100644
--- a/tests/projects/c++/modules/culling/test.lua
+++ b/tests/projects/c++/modules/culling/test.lua
@@ -7,7 +7,7 @@ function _build()
     if ci_is_running() then
         outdata = os.iorun("xmake -rvD")
     else
-        outdata = os.iorun("xmake -r")
+        outdata = os.iorun("xmake -rv")
     end
     if outdata then
         if outdata:find("culled") then
diff --git a/tests/projects/c++/modules/culling2/test.lua b/tests/projects/c++/modules/culling2/test.lua
index 91c19553c..bc72c4add 100644
--- a/tests/projects/c++/modules/culling2/test.lua
+++ b/tests/projects/c++/modules/culling2/test.lua
@@ -7,7 +7,7 @@ function _build()
     if ci_is_running() then
         outdata = os.iorun("xmake -rvD")
     else
-        outdata = os.iorun("xmake -r")
+        outdata = os.iorun("xmake -rv")
     end
     if outdata then
         if outdata:find("culled") then
diff --git a/tests/projects/c++/modules/culling3/src/hello.mpp b/tests/projects/c++/modules/culling3/src/hello.mpp
new file mode 100644
index 000000000..124bd72bc
--- /dev/null
+++ b/tests/projects/c++/modules/culling3/src/hello.mpp
@@ -0,0 +1,10 @@
+module;
+#include <cstdio>
+
+export module hello;
+
+export namespace hello {
+    void say(const char* str) {
+        printf("%s\n", str);
+    }
+}
diff --git a/tests/projects/c++/modules/culling3/test.lua b/tests/projects/c++/modules/culling3/test.lua
new file mode 100644
index 000000000..d3865ecdc
--- /dev/null
+++ b/tests/projects/c++/modules/culling3/test.lua
@@ -0,0 +1,69 @@
+import("lib.detect.find_tool")
+import("core.base.semver")
+import("utils.ci.is_running", {alias = "ci_is_running"})
+
+function _build()
+    local outdata
+    if ci_is_running() then
+        outdata = os.iorun("xmake -rvD")
+    else
+        outdata = os.iorun("xmake -rv")
+    end
+    if outdata then
+        if not outdata:find("culled") then
+            raise("Modules culling does not work\n%s", outdata)
+        end
+    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})
+        if clang and clang.version and semver.compare(clang.version, "17.0") >= 0 then
+            os.exec("xmake f --toolchain=clang -c --yes")
+            _build()
+            os.exec("xmake clean -a")
+            os.exec("xmake f --toolchain=clang --runtimes=c++_shared -c --yes")
+            _build()
+        end
+
+        os.exec("xmake clean -a")
+        os.exec("xmake f -c --yes")
+        _build()
+    elseif is_subhost("msys") then
+        os.exec("xmake f -c -p mingw --yes")
+        _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 --yes")
+            _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 --yes")
+            _build()
+            os.exec("xmake clean -a")
+            os.exec("xmake f --toolchain=clang --runtimes=c++_shared -c --yes")
+            _build()
+        end
+    end
+end
diff --git a/tests/projects/c++/modules/culling3/xmake.lua b/tests/projects/c++/modules/culling3/xmake.lua
new file mode 100644
index 000000000..7ec9385f3
--- /dev/null
+++ b/tests/projects/c++/modules/culling3/xmake.lua
@@ -0,0 +1,6 @@
+add_rules("mode.release", "mode.debug")
+set_languages("c++20")
+
+target("culling")
+    set_kind("static")
+    add_files("src/*.mpp")