diff options
| author | ruki <[email protected]> | 2025-01-20 18:07:54 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2025-01-20 18:07:54 +0800 |
| commit | c61d7bb40353b161da913bdcbc6fa399e36164a1 (patch) | |
| tree | b56b24a4774d7131730a23961b0184239abe08d3 /tests | |
| parent | bd6386af90d9b3cafbb76e23bdffac19d9cdffea (diff) | |
| parent | 22346776a83fda03c2b1e5054d049ff352dac0fd (diff) | |
Merge pull request #6093 from xmake-io/ci
improve linux arm64 ci
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/projects/c++/modules/test_headerunits.lua | 3 | ||||
| -rw-r--r-- | tests/test_utils/test_build.lua | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/tests/projects/c++/modules/test_headerunits.lua b/tests/projects/c++/modules/test_headerunits.lua index b13b22a7f..aaa350c7c 100644 --- a/tests/projects/c++/modules/test_headerunits.lua +++ b/tests/projects/c++/modules/test_headerunits.lua @@ -44,7 +44,8 @@ function main(t) -- _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 then + 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") _build() diff --git a/tests/test_utils/test_build.lua b/tests/test_utils/test_build.lua index 002c46e1a..8a2b75ce9 100644 --- a/tests/test_utils/test_build.lua +++ b/tests/test_utils/test_build.lua @@ -4,7 +4,8 @@ function test_build:build(argv) os.exec("xmake f -c -D -y") os.exec("xmake") os.rm("build") - os.exec("xmake f -c -D -y --policies=compatibility.version=3.0") + --os.exec("xmake f -c -D -y --policies=compatibility.version:3.0") + os.exec("xmake f -c -D -y --policies=compatibility.version=3.0") -- FIXME os.exec("xmake -r") end |