Merge pull request #7172 from xmake-io/modules

prepare test targets in compile_commands

12 files changed, 109 insertions, 3 deletions

diff --git a/tests/projects/c++/modules/test_base.lua b/tests/projects/c++/modules/test_base.lua
index 6f2a42088..6116b36e6 100644
--- a/tests/projects/c++/modules/test_base.lua
+++ b/tests/projects/c++/modules/test_base.lua
@@ -136,12 +136,12 @@ function run_tests(clang_options, gcc_options, msvc_options)
                 build_tests("clang-cl", clang_cl_options)
                 build_tests("clang-cl", table.join(clang_options, {two_phases = false}))
             end
-            if not clang_options.stdmodule then
+            if clang_options.stdmodule then
+                wprint("std modules tests skipped for Windows clang libc++ as it's not currently supported officially")
+            else
                 build_tests("llvm", clang_libcpp_options)
                 build_tests("clang", clang_libcpp_options)
                 build_tests("clang", table.join(clang_libcpp_options, {two_phases = false}))
-            else
-                wprint("std modules tests skipped for Windows clang libc++ as it's not currently supported officially")
             end
         end
         if msvc_options then
diff --git a/tests/projects/c++/modules/test_xmake_test_stdmodules.lua b/tests/projects/c++/modules/test_xmake_test_stdmodules.lua
new file mode 100644
index 000000000..0e95de5bd
--- /dev/null
+++ b/tests/projects/c++/modules/test_xmake_test_stdmodules.lua
@@ -0,0 +1,42 @@
+inherit("test_base")
+import("utils.ci.is_running", {alias = "ci_is_running"})
+
+CLANG_MIN_VER = "19"
+GCC_MIN_VER = "15"
+MSVC_MIN_VER = "14.35"
+
+function run_xmake_test(...)
+    local flags = ""
+    if ci_is_running() then
+        flags = "-vD"
+    end
+    local outdata, errdata = os.iorun("xmake test " .. flags)
+    assert(outdata, errdata)
+end
+
+function main(_)
+    local clang_options = {stdmodule = true, compiler = "clang", version = CLANG_MIN_VER, after_build = run_xmake_test}
+    local gcc_options = {stdmodule = true, compiler = "gcc", version = GCC_MIN_VER, after_build = run_xmake_test}
+    -- latest mingw gcc 15.1 is broken
+    --  error: F:/msys64/mingw64/include/c++/15.1.0/shared_mutex:105:3: error: 'int std::__glibcxx_rwlock_timedrdlock(pthread_rwlock_t*, const timespec*)' exposes TU-local entity 'int pthread_rwlock_timedrdlock(pthread_rwlock_t*, const timespec*)'
+    --   105 |   __glibcxx_rwlock_timedrdlock (pthread_rwlock_t *__rwlock,
+    --       |   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    -- In file included from F:/msys64/mingw64/include/c++/15.1.0/x86_64-w64-mingw32/bits/gthr-default.h:35,
+    --                  from F:/msys64/mingw64/include/c++/15.1.0/x86_64-w64-mingw32/bits/gthr.h:157,
+    --                  from F:/msys64/mingw64/include/c++/15.1.0/ext/atomicity.h:37,
+    --                  from F:/msys64/mingw64/include/c++/15.1.0/bits/ios_base.h:41,
+    --                  from F:/msys64/mingw64/include/c++/15.1.0/streambuf:45,
+    --                  from F:/msys64/mingw64/include/c++/15.1.0/bits/streambuf_iterator.h:37,
+    --                  from F:/msys64/mingw64/include/c++/15.1.0/iterator:68,
+    --                  from F:/msys64/mingw64/include/c++/15.1.0/x86_64-w64-mingw32/bits/stdc++.h:56:
+    -- F:/msys64/mingw64/include/pthread.h:296:28: note: 'int pthread_rwlock_timedrdlock(pthread_rwlock_t*, const timespec*)' declared with internal linkage
+    --   296 | WINPTHREAD_RWLOCK_DECL int pthread_rwlock_timedrdlock(pthread_rwlock_t *l, const struct timespec *ts)
+    --       |                            ^~~~~~~~~~~~~~~~~~~~~~~~~~
+    -- F:/msys64/mingw64/include/c++/15.1.0/shared_mutex:115:3: error: 'int std::__glibcxx_rwlock_timedwrlock(pthread_rwlock_t*, const timespec*)' exposes TU-local entity 'int pthread_rwlock_timedwrlock(pthread_rwlock_t*, const timespec*)'
+    --   115 |   __glibcxx_rwlock_timedwrlock (pthread_rwlock_t *__rwlock,   local gcc_options = {stdmodule = true, compiler = "gcc", version = GCC_MIN_VER}
+    if is_subhost("msys") then
+        gcc_options = nil
+    end
+    local msvc_options = {stdmodule = true, version = MSVC_MIN_VER}
+    run_tests(clang_options, gcc_options, msvc_options)
+end
diff --git a/tests/projects/c++/modules/xmake_tests3/src/foo.cppm b/tests/projects/c++/modules/xmake_tests3/src/foo.cppm
new file mode 100644
index 000000000..dee531b45
--- /dev/null
+++ b/tests/projects/c++/modules/xmake_tests3/src/foo.cppm
@@ -0,0 +1,7 @@
+export module Foo;
+
+import std;
+
+export void foo() {
+    std::printf("Hello from Foo\n");
+}
diff --git a/tests/projects/c++/modules/xmake_tests3/src/main.cpp b/tests/projects/c++/modules/xmake_tests3/src/main.cpp
new file mode 100644
index 000000000..4e2bb9b57
--- /dev/null
+++ b/tests/projects/c++/modules/xmake_tests3/src/main.cpp
@@ -0,0 +1,8 @@
+import std;
+import Foo;
+
+int main() {
+    foo();
+    std::printf("Hello from main\n");
+    return 0;
+}
diff --git a/tests/projects/c++/modules/xmake_tests3/test.lua b/tests/projects/c++/modules/xmake_tests3/test.lua
new file mode 100644
index 000000000..e36d560d9
--- /dev/null
+++ b/tests/projects/c++/modules/xmake_tests3/test.lua
@@ -0,0 +1 @@
+inherit(".test_xmake_test_stdmodules")
diff --git a/tests/projects/c++/modules/xmake_tests3/xmake.lua b/tests/projects/c++/modules/xmake_tests3/xmake.lua
new file mode 100644
index 000000000..67021fcd9
--- /dev/null
+++ b/tests/projects/c++/modules/xmake_tests3/xmake.lua
@@ -0,0 +1,12 @@
+add_rules("mode.debug", "mode.release")
+set_languages("c++23")
+
+target("module_dep")
+    set_kind("moduleonly")
+    add_files("src/*.cppm")
+
+target("module_target1")
+    set_kind("moduleonly")
+    add_files("src/*.cppm")
+    add_deps("module_dep")
+    add_tests("tests", {kind = "binary", files = "src/main.cpp", build_should_pass = true, run_should_pass = true})
diff --git a/tests/projects/c++/modules/xmake_tests4/.gitignore b/tests/projects/c++/modules/xmake_tests4/.gitignore
new file mode 100644
index 000000000..9d988d246
--- /dev/null
+++ b/tests/projects/c++/modules/xmake_tests4/.gitignore
@@ -0,0 +1,4 @@
+.xmake/
+.vscode/
+build/
+uselocalxmake.sh
diff --git a/tests/projects/c++/modules/xmake_tests4/src/main.cpp b/tests/projects/c++/modules/xmake_tests4/src/main.cpp
new file mode 100644
index 000000000..45222c241
--- /dev/null
+++ b/tests/projects/c++/modules/xmake_tests4/src/main.cpp
@@ -0,0 +1,5 @@
+import work;
+
+int main() {
+	do_work<int>();
+}
diff --git a/tests/projects/c++/modules/xmake_tests4/src/work.mpp b/tests/projects/c++/modules/xmake_tests4/src/work.mpp
new file mode 100644
index 000000000..27b5f2089
--- /dev/null
+++ b/tests/projects/c++/modules/xmake_tests4/src/work.mpp
@@ -0,0 +1,14 @@
+export module work;
+import std;
+
+export
+template<typename T>
+void do_work() {
+    if constexpr (std::is_same_v<T, int>) {
+        std::println("Hello world!");
+    } else if constexpr (std::is_same_v<T, double>) {
+        std::println("Hello test!");
+    } else {
+        std::println("Hello unknown type!");
+    }
+}
diff --git a/tests/projects/c++/modules/xmake_tests4/test.lua b/tests/projects/c++/modules/xmake_tests4/test.lua
new file mode 100644
index 000000000..e36d560d9
--- /dev/null
+++ b/tests/projects/c++/modules/xmake_tests4/test.lua
@@ -0,0 +1 @@
+inherit(".test_xmake_test_stdmodules")
diff --git a/tests/projects/c++/modules/xmake_tests4/test/test.cpp b/tests/projects/c++/modules/xmake_tests4/test/test.cpp
new file mode 100644
index 000000000..fae906e76
--- /dev/null
+++ b/tests/projects/c++/modules/xmake_tests4/test/test.cpp
@@ -0,0 +1,5 @@
+import work;
+
+int main() {
+	do_work<double>();
+}
diff --git a/tests/projects/c++/modules/xmake_tests4/xmake.lua b/tests/projects/c++/modules/xmake_tests4/xmake.lua
new file mode 100644
index 000000000..43a330fe1
--- /dev/null
+++ b/tests/projects/c++/modules/xmake_tests4/xmake.lua
@@ -0,0 +1,7 @@
+add_rules("mode.debug", "mode.release")
+set_languages("c++23")
+
+target("llvm")
+    set_kind("binary")
+    add_files("src/*.cpp", "src/*.mpp")
+    add_tests("test", { files = "test/test.cpp", remove_files = "src/main.cpp" })