-
Notifications
You must be signed in to change notification settings - Fork 14.3k
[libc++abi] Fix test on Android #74753
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
Follow up to llvm#72727. The added test could not be executed on Android.
@llvm/pr-subscribers-libcxxabi Author: Maksim Panchenko (maksfb) ChangesFollow up to #72727. The added test could not be executed on Android. Full diff: https://github.com/llvm/llvm-project/pull/74753.diff 1 Files Affected:
diff --git a/libcxxabi/test/native/x86_64/lpstart-zero.pass.sh.s b/libcxxabi/test/native/x86_64/lpstart-zero.pass.sh.s
index ea9dd0104c086..249d243d921ea 100644
--- a/libcxxabi/test/native/x86_64/lpstart-zero.pass.sh.s
+++ b/libcxxabi/test/native/x86_64/lpstart-zero.pass.sh.s
@@ -2,7 +2,7 @@
# RUN: %t.exe
# REQUIRES: linux && target={{x86_64-.+}}
-# UNSUPPORTED: no-exceptions
+# UNSUPPORTED: no-exceptions || android
## Check that libc++abi works correctly when LPStart address is explicitly set
## to zero.
|
Unrelated |
Checked that all test failures are unrelated. |
@rprichard Can you take a look? I suspect the right thing to do here is not to mark the test as |
I think the The
I can't make the executable work as a PIE because the address of the landing pad would require a dynamic relocation, which can't be applied because
Also:
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for the analysis @rprichard!
@maksfb Can you please address those comments?
@@ -2,7 +2,7 @@ | |||
# RUN: %t.exe | |||
|
|||
# REQUIRES: linux && target={{x86_64-.+}} | |||
# UNSUPPORTED: no-exceptions | |||
# UNSUPPORTED: no-exceptions || android |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@rprichard What would be the right target-based annotation here?
// UNSUPPORTED: target={{.+}}-android{{.+}}
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think I would change the suffix to use {{.*}}
to also match a triple without the version number suffix, just for completeness:
// UNSUPPORTED: target={{.+}}-android{{.*}}
The two unversioned Android annotations I currently see in libc++ also use a {{.*}}
suffix:
// XFAIL: LIBCXX-ANDROID-FIXME && target={{i686|x86_64}}-{{.+}}-android{{.*}}
// UNSUPPORTED: target=i686-{{.+}}-android{{.*}}
Fixed the execution command and the comment. The test is supposed to be non-PIE, which excludes it from testing on Android. |
Follow up to #72727. The added test could not be executed on Android.