diff options
| -rw-r--r-- | tests/projects/c++/linkorders/test.lua | 12 | ||||
| -rw-r--r-- | tests/projects/c++/linkorders/xmake.lua | 10 |
2 files changed, 13 insertions, 9 deletions
diff --git a/tests/projects/c++/linkorders/test.lua b/tests/projects/c++/linkorders/test.lua index b57362078..704959e28 100644 --- a/tests/projects/c++/linkorders/test.lua +++ b/tests/projects/c++/linkorders/test.lua @@ -1,3 +1,13 @@ function main(t) - t:build() + + -- freebsd ci is slower + if is_host("bsd") then + return + end + + -- only for x86/x64, because it will take too long time on ci with arm/mips + if os.subarch():startswith("x") or os.subarch() == "i386" then + t:build() + end end + diff --git a/tests/projects/c++/linkorders/xmake.lua b/tests/projects/c++/linkorders/xmake.lua index 9a8834e41..8a5f1d18c 100644 --- a/tests/projects/c++/linkorders/xmake.lua +++ b/tests/projects/c++/linkorders/xmake.lua @@ -1,8 +1,6 @@ add_rules("mode.debug", "mode.release") -if not is_host("bsd") then - add_requires("libpng") -end +add_requires("libpng") target("bar") set_kind("shared") @@ -24,11 +22,7 @@ target("demo") if is_plat("macosx") then add_frameworks("Foundation", "CoreFoundation") end - if is_host("bsd") then - add_linkorders("framework::Foundation", "foo") - else - add_linkorders("framework::Foundation", "png16", "foo") - end + add_linkorders("framework::Foundation", "png16", "foo") add_linkorders("dl", "linkgroup::syslib") add_linkgroups("m", "pthread", {name = "syslib"}) |
