[lldb] Restrict TestVariableAnnotationsDisassembler.py to ELF x86_64 (skip on Windows/COFF) #156026
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…(skip on Windows/COFF) The test assembles `d_original_example.s`, which contains ELF-specific directives (e.g. `.ident`, `.note.GNU-stack`, `.debug_*` sections). These fail on Windows/COFF even on x86_64. Gate the test to x86_64 on ELF platforms (Linux/FreeBSD/NetBSD).
Member
|
@llvm/pr-subscribers-lldb Author: Abdullah Mohammad Amin (UltimateForce21) ChangesThe
These directives are not understood by COFF on Windows, so the test fails This patch adds decorators to gate the test,
Follow-up to #155942. Full diff: https://github.com/llvm/llvm-project/pull/156026.diff 1 Files Affected:
diff --git a/lldb/test/API/functionalities/disassembler-variables/TestVariableAnnotationsDisassembler.py b/lldb/test/API/functionalities/disassembler-variables/TestVariableAnnotationsDisassembler.py
index 4d99ea771605a..c3873f1e6e943 100644
--- a/lldb/test/API/functionalities/disassembler-variables/TestVariableAnnotationsDisassembler.py
+++ b/lldb/test/API/functionalities/disassembler-variables/TestVariableAnnotationsDisassembler.py
@@ -22,6 +22,8 @@ def _disassemble_verbose_symbol(self, symname):
self.runCmd(f"disassemble -n {symname} -v", check=True)
return self.res.GetOutput()
+ @skipIfWindows
+ @skipUnlessPlatform(["linux","freebsd","netbsd"])
@skipIf(archs=no_match(["x86_64"]))
def test_d_original_example_O1(self):
obj = self._build_obj("d_original_example.o")
@@ -34,6 +36,8 @@ def test_d_original_example_O1(self):
self.assertNotIn("<decoding error>", out)
@no_debug_info_test
+ @skipIfWindows
+ @skipUnlessPlatform(["linux","freebsd","netbsd"])
@skipIf(archs=no_match(["x86_64"]))
def test_regs_int_params(self):
obj = self._build_obj("regs_int_params.o")
@@ -49,6 +53,8 @@ def test_regs_int_params(self):
self.assertNotIn("<decoding error>", out)
@no_debug_info_test
+ @skipIfWindows
+ @skipUnlessPlatform(["linux","freebsd","netbsd"])
@skipIf(archs=no_match(["x86_64"]))
def test_regs_fp_params(self):
obj = self._build_obj("regs_fp_params.o")
@@ -64,6 +70,8 @@ def test_regs_fp_params(self):
self.assertNotIn("<decoding error>", out)
@no_debug_info_test
+ @skipIfWindows
+ @skipUnlessPlatform(["linux","freebsd","netbsd"])
@skipIf(archs=no_match(["x86_64"]))
def test_regs_mixed_params(self):
obj = self._build_obj("regs_mixed_params.o")
@@ -79,6 +87,8 @@ def test_regs_mixed_params(self):
self.assertNotIn("<decoding error>", out)
@no_debug_info_test
+ @skipIfWindows
+ @skipUnlessPlatform(["linux","freebsd","netbsd"])
@skipIf(archs=no_match(["x86_64"]))
def test_live_across_call(self):
obj = self._build_obj("live_across_call.o")
@@ -91,6 +101,8 @@ def test_live_across_call(self):
self.assertNotIn("<decoding error>", out)
@no_debug_info_test
+ @skipIfWindows
+ @skipUnlessPlatform(["linux","freebsd","netbsd"])
@skipIf(archs=no_match(["x86_64"]))
def test_loop_reg_rotate(self):
obj = self._build_obj("loop_reg_rotate.o")
@@ -105,6 +117,8 @@ def test_loop_reg_rotate(self):
self.assertNotIn("<decoding error>", out)
@no_debug_info_test
+ @skipIfWindows
+ @skipUnlessPlatform(["linux","freebsd","netbsd"])
@skipIf(archs=no_match(["x86_64"]))
def test_seed_reg_const_undef(self):
obj = self._build_obj("seed_reg_const_undef.o")
|
|
✅ With the latest revision this PR passed the Python code formatter. |
Collaborator
DavidSpickett
left a comment
DavidSpickett
left a comment
There was a problem hiding this comment.
You might be able to apply the skip to the class, instead of repeating it for each function. Can you try that?
One test for example does this:
# Windows does not allow quotes in file names.
@skipIf(hostoslist=["windows"])
@skipIfRemote
class TestGdbRemoteLibrariesSvr4Support(gdbremote_testcase.GdbRemoteTestCaseBase):
FEATURE_NAME = "qXfer:libraries-svr4:read"
Certain decorators might not work in that position though, so give it a go.
lldb/test/API/functionalities/disassembler-variables/TestVariableAnnotationsDisassembler.py
Outdated
Show resolved
Hide resolved
Collaborator
|
Also add a comment to either the first skip, or the one skip (whichever you end up doing), saying that the test requires ELF directives. Saves someone a trip to git blame later. |
This change moves the platform skip logic to the test class instead of repeating it for each method.
Contributor
Author
|
Thank you for the suggestions and I have done as you have advised. |
Collaborator
|
Edited the PR description slightly before merging, to reflect the single decorator. |
Collaborator
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/163/builds/25623 Here is the relevant piece of the build log for the reference |
Collaborator
|
Btw, you have some leftover debug |
Collaborator
And this failure you can safely ignore :) |
Contributor
Author
Sounds good! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The
TestVariableAnnotationsDisassembler.pytest assemblesd_original_example.s,which contains ELF-specific directives such as:
.ident.section ".note.GNU-stack", "", @progbits.section .debug_line, "", @progbitsThese directives are not understood by COFF on Windows, so the test fails
on the lldb-remote-linux-win builder even when running on x86_64.
This patch adds a decorator to gate the test,
@skipUnlessPlatform(["linux", "freebsd", "netbsd", "android"])—runs only on ELF platforms
Follow-up to #155942.