summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/projects/other/merge_archive/test.lua4
-rw-r--r--tests/projects/other/merge_archive2/test.lua4
2 files changed, 8 insertions, 0 deletions
diff --git a/tests/projects/other/merge_archive/test.lua b/tests/projects/other/merge_archive/test.lua
index b57362078..88594b1d5 100644
--- a/tests/projects/other/merge_archive/test.lua
+++ b/tests/projects/other/merge_archive/test.lua
@@ -1,3 +1,7 @@
function main(t)
+ -- Solaris ar does not support merging archives with duplicate object file names
+ if is_host("solaris") then
+ return
+ end
t:build()
end
diff --git a/tests/projects/other/merge_archive2/test.lua b/tests/projects/other/merge_archive2/test.lua
index b57362078..88594b1d5 100644
--- a/tests/projects/other/merge_archive2/test.lua
+++ b/tests/projects/other/merge_archive2/test.lua
@@ -1,3 +1,7 @@
function main(t)
+ -- Solaris ar does not support merging archives with duplicate object file names
+ if is_host("solaris") then
+ return
+ end
t:build()
end