[llvm-ar] Fix darwin-related tests' XFAIL annotation

[pratlucas]

The tests updated by this commit are expected to fail when targetting a
darwin platform. As they rely on target detection based on the host,
this is currently checked by using the XFAIL: system-darwin
annotation.

This approach becomes a problem when trying to run such tests on a
cross-compiling build of clang on a darwin platform. When no darwin
targets are included in the build, the XFAIL will still apply even
though the target used is not related to the darwin platform, and the
tests will unexpectedly pass.

To fix this issue, this patch updates the condition used by the tests'
XFAIL annotation to target={{.*}}-darwin{{.*}}, ensuring they only are
xfailed when the relevant target is used.

[llvmbot]

@llvm/pr-subscribers-llvm-binary-utilities

Author: Lucas Duarte Prates (pratlucas)

Changes

The tests updated by this commit are expected to fail when targetting a
darwin platform. As they rely on target detection based on the host,
this is currently checked by using the XFAIL: system-darwin
annotation.

This approach becomes a problem when trying to run such tests on a
cross-compiling build of clang on a darwin platform. When no darwin
targets are included in the build, the XFAIL will still apply even
though the target used is not related to the darwin platform, and the
tests will unexpectedly pass.

To fix this issue, this patch updates the condition used by the tests'
XFAIL annotation to target={{.*}}-darwin{{.*}}, ensuring they only are
xfailed when the relevant target is used.

---

Full diff: https://github.com/llvm/llvm-project/pull/130144.diff

2 Files Affected:

• (modified) llvm/test/tools/llvm-ar/extract.test (+1-1)
• (modified) llvm/test/tools/llvm-ar/print.test (+1-1)

diff --git a/llvm/test/tools/llvm-ar/extract.test b/llvm/test/tools/llvm-ar/extract.test
index ccad703f3a149..bf46cc0743c7d 100644
--- a/llvm/test/tools/llvm-ar/extract.test
+++ b/llvm/test/tools/llvm-ar/extract.test
@@ -1,5 +1,5 @@
 ## Test extract operation.
-# XFAIL: system-darwin
+# XFAIL: target={{.*}}-darwin{{.*}}
 
 # RUN: rm -rf %t && mkdir -p %t/extracted/
 
diff --git a/llvm/test/tools/llvm-ar/print.test b/llvm/test/tools/llvm-ar/print.test
index a27cab4a227e1..997c05f225a8b 100644
--- a/llvm/test/tools/llvm-ar/print.test
+++ b/llvm/test/tools/llvm-ar/print.test
@@ -1,5 +1,5 @@
 ## Test Print output
-# XFAIL: system-darwin
+# XFAIL: target={{.*}}-darwin{{.*}}
 
 # RUN: rm -rf %t && mkdir -p %t
 # RUN: echo file1 > %t/1.txt

[jh7370]

I don't have a Mac to test this on. It seems simple enough and I'm fairly confident it is correct. I assume you have verified that this does indeed XFAIL the tests under the condition you expect it to?

One request: please change the tag in the title to [llvm-ar], since this change has nothing to do with clang. LGTM with that.

[pratlucas]

Thanks for the review! I did verify it on a Mac, both with a regular LLVM build and a cross-compiling downstream project (arm/arm-toolchain).

I've updated the PR title, which will be final commit message. Sorry about mixing it up, that's what I get for copy-pasting the commit message from #130138 :)

[AnthonyLatsis]

@pratlucas This change effectively un-XFAILed the tests for LLVM builds through the Swift build script because we use Apple platform names for the LLVM target triple rather than darwin, e.g. x86_64-apple-macosx13.0. Was the unexpected pass happening when running these tests on arm64 macOS with a cross compiled arm64 non-darwin llvm-ar?