Merge pull request #4677 from Arthapz/optimise-dag

improve module circular dependency detection 

9 files changed, 70 insertions, 12 deletions

diff --git a/tests/projects/c++/modules/circular_dependency/src/hello.mpp b/tests/projects/c++/modules/circular_dependency/src/hello.mpp
new file mode 100644
index 000000000..50f0f2c8f
--- /dev/null
+++ b/tests/projects/c++/modules/circular_dependency/src/hello.mpp
@@ -0,0 +1,13 @@
+export module hello;
+
+import hello3;
+
+export namespace hello {
+    class say {
+    public:
+        say(int data);
+        void hello();
+    private:
+        int data_;
+    };
+}
diff --git a/tests/projects/c++/modules/circular_dependency/src/hello2.mpp b/tests/projects/c++/modules/circular_dependency/src/hello2.mpp
new file mode 100644
index 000000000..1b6258af1
--- /dev/null
+++ b/tests/projects/c++/modules/circular_dependency/src/hello2.mpp
@@ -0,0 +1,3 @@
+export module hello2;
+
+import hello;
diff --git a/tests/projects/c++/modules/circular_dependency/src/hello3.mpp b/tests/projects/c++/modules/circular_dependency/src/hello3.mpp
new file mode 100644
index 000000000..4966cf0c0
--- /dev/null
+++ b/tests/projects/c++/modules/circular_dependency/src/hello3.mpp
@@ -0,0 +1,3 @@
+export module hello3;
+
+import hello2;
diff --git a/tests/projects/c++/modules/circular_dependency/src/main.cpp b/tests/projects/c++/modules/circular_dependency/src/main.cpp
new file mode 100644
index 000000000..6f80b6c7d
--- /dev/null
+++ b/tests/projects/c++/modules/circular_dependency/src/main.cpp
@@ -0,0 +1,7 @@
+import hello;
+
+int main() {
+    hello::say s(sizeof(hello::say));
+    s.hello();
+    return 0;
+}
\ No newline at end of file
diff --git a/tests/projects/c++/modules/circular_dependency/test.lua b/tests/projects/c++/modules/circular_dependency/test.lua
new file mode 100644
index 000000000..727e9187e
--- /dev/null
+++ b/tests/projects/c++/modules/circular_dependency/test.lua
@@ -0,0 +1,7 @@
+import(".test_base", {alias = "test_build"})
+
+function main(t)
+    if test_build.can_build() then
+        t:will_raise(test_build, "circular modules dependency detected")
+    end
+end
diff --git a/tests/projects/c++/modules/circular_dependency/xmake.lua b/tests/projects/c++/modules/circular_dependency/xmake.lua
new file mode 100644
index 000000000..73254924e
--- /dev/null
+++ b/tests/projects/c++/modules/circular_dependency/xmake.lua
@@ -0,0 +1,8 @@
+add_rules("mode.release", "mode.debug")
+set_languages("c++20")
+
+target("circular_dependency")
+    set_kind("binary")
+    add_files("src/*.cpp", "src/*.mpp")
+
+
diff --git a/tests/projects/c++/modules/test_base.lua b/tests/projects/c++/modules/test_base.lua
index c4252d41c..092fbd72f 100644
--- a/tests/projects/c++/modules/test_base.lua
+++ b/tests/projects/c++/modules/test_base.lua
@@ -1,12 +1,29 @@
 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
-        os.exec("xmake -rvD")
+    if ci_is_running() then
+        os.run("xmake -rvD")
     else
-        os.exec("xmake -r")
+        os.run("xmake -r")
+    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
 
diff --git a/tests/projects/c++/modules/test_headerunits.lua b/tests/projects/c++/modules/test_headerunits.lua
index ba7fde015..bb32070cf 100644
--- a/tests/projects/c++/modules/test_headerunits.lua
+++ b/tests/projects/c++/modules/test_headerunits.lua
@@ -1,13 +1,13 @@
 import("lib.detect.find_tool")
 import("core.base.semver")
 import("detect.sdks.find_vstudio")
+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
-        os.exec("xmake -rvD")
+    if ci_is_running() then
+        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 c408c1d08..68a5922ef 100644
--- a/tests/projects/c++/modules/test_stdmodules.lua
+++ b/tests/projects/c++/modules/test_stdmodules.lua
@@ -1,13 +1,13 @@
 import("lib.detect.find_tool")
 import("core.base.semver")
 import("core.tool.toolchain")
+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
-        os.exec("xmake -rvD")
+    if ci_is_running() then
+        os.run("xmake -rvD")
     else
-        os.exec("xmake -r")
+        os.run("xmake -r")
     end
 end