From 601edb4396896db28c75b47d28e168566ec64897 Mon Sep 17 00:00:00 2001 From: Arthur LAURENT Date: Wed, 26 Mar 2025 15:11:05 +0100 Subject: (C++ modules) disable std module on some tests this should improve C++ module tests speed --- tests/projects/c++/modules/test_headerunits.lua | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'tests/projects/c++/modules/test_headerunits.lua') diff --git a/tests/projects/c++/modules/test_headerunits.lua b/tests/projects/c++/modules/test_headerunits.lua index aaa350c7c..d34c70757 100644 --- a/tests/projects/c++/modules/test_headerunits.lua +++ b/tests/projects/c++/modules/test_headerunits.lua @@ -22,12 +22,12 @@ function main(t) 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 --policies=build.c++.clang.fallbackscanner -c --yes") + -- os.exec("xmake f --toolchain=clang -c --yes --policies=build.c++.modules.std:n,build.c++.clang.fallbackscanner") -- _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 --policies=build.c++.clang.fallbackscanner --runtimes=c++_shared -c --yes") + -- os.exec("xmake f --toolchain=clang --runtimes=c++_shared -c --yes --policies=build.c++.modules.std:n,build.c++.clang.fallbackscanner") -- _build() -- end end @@ -35,19 +35,19 @@ function main(t) local vs = find_vstudio() if vs and vs["2022"] then os.exec("xmake clean -a") - os.exec("xmake f -c --yes") + 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") + -- os.exec("xmake f -c -p mingw --yes --policies=build.c++.modules.std:n,build.c++.gcc.fallbackscanner") -- _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 --policies=build.c++.gcc.fallbackscanner -c --yes") + os.exec("xmake f -c --yes --policies=build.c++.modules.std:n,build.c++.gcc.fallbackscanner") _build() end local clang = find_tool("clang", {version = true}) @@ -55,14 +55,14 @@ function main(t) 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 --policies=build.c++.clang.fallbackscanner -c --yes") + os.exec("xmake f --toolchain=clang -c --yes --policies=build.c++.modules.std:n,build.c++.clang.fallbackscanner") _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 --policies=build.c++.clang.fallbackscanner --runtimes=c++_shared -c --yes") + -- os.exec("xmake f --toolchain=clang --runtimes=c++_shared -c --yes --policies=build.c++.modules.std:n,build.c++.clang.fallbackscanner") -- _build() -- end end -- cgit v1.3.1