diff options
| author | ruki <[email protected]> | 2025-06-29 22:12:53 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2025-06-29 22:12:53 +0800 |
| commit | f1ac3987ca9962638990a796778fc16b41507d6c (patch) | |
| tree | b5940105d1998a80a56327f4038d0560b01bcc1a /tests/projects/c++/modules | |
| parent | c6f7c7f4036dc9f7f9ad3aab6071c838e3877610 (diff) | |
fix test for clang modules
Diffstat (limited to 'tests/projects/c++/modules')
6 files changed, 7 insertions, 7 deletions
diff --git a/tests/projects/c++/modules/hello_with_pch/test.lua b/tests/projects/c++/modules/hello_with_pch/test.lua index 033d2882c..7cb5dca01 100644 --- a/tests/projects/c++/modules/hello_with_pch/test.lua +++ b/tests/projects/c++/modules/hello_with_pch/test.lua @@ -1,6 +1,6 @@ inherit(".test_base") -CLANG_MIN_VER = "17" +CLANG_MIN_VER = is_subhost("windows") and "19" or "17" GCC_MIN_VER = "11" MSVC_MIN_VER = "14.29" diff --git a/tests/projects/c++/modules/test_base.lua b/tests/projects/c++/modules/test_base.lua index 0f030e065..214f221a4 100644 --- a/tests/projects/c++/modules/test_base.lua +++ b/tests/projects/c++/modules/test_base.lua @@ -3,7 +3,7 @@ import("core.base.semver") import("core.tool.toolchain") import("utils.ci.is_running", {alias = "ci_is_running"}) -CLANG_MIN_VER = "17" +CLANG_MIN_VER = is_subhost("windows") and "19" or "17" CLANG_CL_MIN_VER = "19" GCC_MIN_VER = "11" MSVC_MIN_VER = "14.29" diff --git a/tests/projects/c++/modules/test_culling.lua b/tests/projects/c++/modules/test_culling.lua index 66f96227a..9accf9a12 100644 --- a/tests/projects/c++/modules/test_culling.lua +++ b/tests/projects/c++/modules/test_culling.lua @@ -1,6 +1,6 @@ inherit("test_base") -CLANG_MIN_VER = "17" +CLANG_MIN_VER = is_subhost("windows") and "19" or "17" GCC_MIN_VER = "11" MSVC_MIN_VER = "14.29" diff --git a/tests/projects/c++/modules/test_dependency_scanner.lua b/tests/projects/c++/modules/test_dependency_scanner.lua index c27b52887..6bedb7718 100644 --- a/tests/projects/c++/modules/test_dependency_scanner.lua +++ b/tests/projects/c++/modules/test_dependency_scanner.lua @@ -1,7 +1,7 @@ inherit("test_base") import("utils.ci.is_running", {alias = "ci_is_running"}) -CLANG_MIN_VER = "17" +CLANG_MIN_VER = is_subhost("windows") and "19" or "17" GCC_MIN_VER = "11" MSVC_MIN_VER = "14.29" diff --git a/tests/projects/c++/modules/test_duplicate_modules.lua b/tests/projects/c++/modules/test_duplicate_modules.lua index 76e8806f7..f6b7fd43b 100644 --- a/tests/projects/c++/modules/test_duplicate_modules.lua +++ b/tests/projects/c++/modules/test_duplicate_modules.lua @@ -1,13 +1,13 @@ inherit("test_base") import("utils.ci.is_running", {alias = "ci_is_running"}) -CLANG_MIN_VER = "17" +CLANG_MIN_VER = is_subhost("windows") and "19" or "17" GCC_MIN_VER = "11" MSVC_MIN_VER = "14.29" function _build() try { - function() + function () if ci_is_running() then os.run("xmake -rvD") else diff --git a/tests/projects/c++/modules/test_partitions.lua b/tests/projects/c++/modules/test_partitions.lua index ed03bd9d7..38500991f 100644 --- a/tests/projects/c++/modules/test_partitions.lua +++ b/tests/projects/c++/modules/test_partitions.lua @@ -1,6 +1,6 @@ inherit("test_base") -CLANG_MIN_VER = "18" +CLANG_MIN_VER = is_subhost("windows") and "19" or "18" GCC_MIN_VER = "13" MSVC_MIN_VER = "14.30" |