(C++ modules support) refactor tests

1 files changed, 11 insertions, 64 deletions

diff --git a/tests/projects/c++/modules/test_headerunits.lua b/tests/projects/c++/modules/test_headerunits.lua
index 264cca6e6..17f6373c0 100644
--- a/tests/projects/c++/modules/test_headerunits.lua
+++ b/tests/projects/c++/modules/test_headerunits.lua
@@ -1,70 +1,17 @@
-import("lib.detect.find_tool")
-import("core.base.semver")
-import("detect.sdks.find_vstudio")
+inherit("test_base")
 import("utils.ci.is_running", {alias = "ci_is_running"})
 
-function _build()
-    if ci_is_running() then
-        os.run("xmake -rvD")
-    else
-        os.run("xmake -r")
-    end
-    local outdata = os.iorun("xmake")
-    if outdata then
-        if outdata:find("compiling") or outdata:find("linking") or outdata:find("generating") then
-            raise("Modules incremental compilation does not work\n%s", outdata)
-        end
-    end
-end
+GCC_MIN_VER = "11"
+MSVC_MIN_VER = "14.30"
 
 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, "15.0") >= 0 then
-            -- clang headerunit are bugged
-            -- os.exec("xmake f --toolchain=clang -c --yes --policies=build.c++.modules.std:n,build.c++.modules.fallbackscanner:y")
-            -- _build()
-            -- if semver.compare(clang.version, "17.0") >= 0 then
-            --     os.exec("xmake clean -a")
-            --     -- clang-scan-deps dependency detection doesn't support header units atm
-            --     os.exec("xmake f --toolchain=clang --runtimes=c++_shared -c --yes --policies=build.c++.modules.std:n,build.c++.modules.fallbackscanner:y")
-            --     _build()
-            -- end
-        end
-
-        local vs = find_vstudio()
-        if vs and vs["2022"] then
-            os.exec("xmake clean -a")
-            os.exec("xmake f -c --yes --policies=build.c++.modules.std:n")
-            _build()
-        end
-    elseif is_subhost("msys") then
-        -- on windows, mingw modulemapper doesn't handle headeunit path correctly, but it's working with mingw on macOS / Linux
-        -- os.exec("xmake f -c -p mingw --yes --policies=build.c++.modules.std:n,build.c++.modules.fallbackscanner:y")
-        -- _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 and
-            os.arch() ~= "arm64" then -- gcc/arm64: internal compiler error: in core_vals, at cp/module.cc:6108
-            -- gcc dependency detection doesn't support header units atm
-            os.exec("xmake f -c --yes --policies=build.c++.modules.std:n,build.c++.modules.fallbackscanner:y")
-            _build()
-        end
-        local clang = find_tool("clang", {version = true})
-        if clang and clang.version then
-            if semver.compare(clang.version, "19.0") >= 0 then
-                os.exec("xmake clean -a")
-                -- clang-scan-deps dependency detection doesn't support header units atm
-                os.exec("xmake f --toolchain=clang -c --yes --policies=build.c++.modules.std:n,build.c++.modules.fallbackscanner:y")
-                _build()
-            end
-            -- libc++ headerunit are bugged
-            -- if semver.compare(clang.version, "17.0") >= 0 then
-            --     os.exec("xmake clean -a")
-            --     -- clang-scan-deps dependency detection doesn't support header units atm
-            --     os.exec("xmake f --toolchain=clang --runtimes=c++_shared -c --yes --policies=build.c++.modules.std:n,build.c++.modules.fallbackscanner:y")
-            --     _build()
-            -- end
-        end
+    local gcc_options = {fallbackscanner = true, compiler = "gcc", version = GCC_MIN_VER}
+    -- gcc/arm64: internal compiler error: in core_vals, at cp/module.cc:6108
+    -- on windows, mingw modulemapper doesn't handle headeunit path correctly, but it's working with mingw on macOS / Linux
+    if os.arch() == "arm64" or is_subhost("msys") then
+        gcc_options = nil
     end
+    local msvc_options = {version = MSVC_MIN_VER}
+    -- skip clang tests, headerunits with clang is not stable
+    run_tests(nil, gcc_options, msvc_options)
 end