From d0fe8c0f73b32f1e7dee88e6a5b4ec275c4b31f4 Mon Sep 17 00:00:00 2001 From: ruki Date: Mon, 29 Dec 2025 21:01:34 +0800 Subject: improve test --- tests/projects/c++/modules/test_base.lua | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'tests/projects/c++/modules/test_base.lua') diff --git a/tests/projects/c++/modules/test_base.lua b/tests/projects/c++/modules/test_base.lua index 6f2a42088..29d6f51bc 100644 --- a/tests/projects/c++/modules/test_base.lua +++ b/tests/projects/c++/modules/test_base.lua @@ -126,7 +126,11 @@ function run_tests(clang_options, gcc_options, msvc_options) end if is_subhost("windows") then if clang_options then - build_tests("llvm", clang_options) + if clang_options.stdmodule then + wprint("std modules tests skipped for Windows llvm (default: libc++), as it's not currently supported officially") + else + build_tests("llvm", clang_options) + end build_tests("clang", clang_options) build_tests("clang", table.join(clang_options, {two_phases = false})) if not clang_options.disable_clang_cl then @@ -136,12 +140,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 -- cgit v1.3.1 From 34c820992ce4dd7a11ed644f7ab253a98466c54d Mon Sep 17 00:00:00 2001 From: ruki Date: Mon, 29 Dec 2025 22:32:44 +0800 Subject: fix module tests --- tests/projects/c++/modules/test_base.lua | 6 +----- tests/projects/c++/modules/xmake_tests4/xmake.lua | 3 --- 2 files changed, 1 insertion(+), 8 deletions(-) (limited to 'tests/projects/c++/modules/test_base.lua') diff --git a/tests/projects/c++/modules/test_base.lua b/tests/projects/c++/modules/test_base.lua index 29d6f51bc..6116b36e6 100644 --- a/tests/projects/c++/modules/test_base.lua +++ b/tests/projects/c++/modules/test_base.lua @@ -126,11 +126,7 @@ function run_tests(clang_options, gcc_options, msvc_options) end if is_subhost("windows") then if clang_options then - if clang_options.stdmodule then - wprint("std modules tests skipped for Windows llvm (default: libc++), as it's not currently supported officially") - else - build_tests("llvm", clang_options) - end + build_tests("llvm", clang_options) build_tests("clang", clang_options) build_tests("clang", table.join(clang_options, {two_phases = false})) if not clang_options.disable_clang_cl then diff --git a/tests/projects/c++/modules/xmake_tests4/xmake.lua b/tests/projects/c++/modules/xmake_tests4/xmake.lua index 63a01661e..43a330fe1 100644 --- a/tests/projects/c++/modules/xmake_tests4/xmake.lua +++ b/tests/projects/c++/modules/xmake_tests4/xmake.lua @@ -1,10 +1,7 @@ add_rules("mode.debug", "mode.release") set_languages("c++23") -set_encodings("utf-8") ---add_rules("plugin.compile_commands.autoupdate", {outputdir = ".vscode"}) target("llvm") set_kind("binary") - set_runtimes("c++_shared") add_files("src/*.cpp", "src/*.mpp") add_tests("test", { files = "test/test.cpp", remove_files = "src/main.cpp" }) -- cgit v1.3.1