[lldb] Fixed the @skipUnlessAArch64MTELinuxCompiler decorator in case of Windows host #115337
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
… of Windows host Fixed the @skipUnlessAArch64MTELinuxCompiler decorator in case of Windows host.
|
@llvm/pr-subscribers-lldb Author: Dmitry Vasilyev (slydiman) ChangesFixed the @skipUnlessAArch64MTELinuxCompiler decorator in case of Windows host. Full diff: https://github.com/llvm/llvm-project/pull/115337.diff 1 Files Affected:
diff --git a/lldb/packages/Python/lldbsuite/test/decorators.py b/lldb/packages/Python/lldbsuite/test/decorators.py
index 34319e203a3177..d4c5e61a8fd95a 100644
--- a/lldb/packages/Python/lldbsuite/test/decorators.py
+++ b/lldb/packages/Python/lldbsuite/test/decorators.py
@@ -989,13 +989,27 @@ def skipUnlessAArch64MTELinuxCompiler(func):
def is_toolchain_with_mte():
compiler_path = lldbplatformutil.getCompiler()
- compiler = os.path.basename(compiler_path)
- f = tempfile.NamedTemporaryFile()
+ f_src = tempfile.NamedTemporaryFile(delete=False)
+ f_out = tempfile.NamedTemporaryFile(delete=False)
if lldbplatformutil.getPlatform() == "windows":
return "MTE tests are not compatible with 'windows'"
- cmd = "echo 'int main() {}' | %s -x c -o %s -" % (compiler_path, f.name)
+ # Note hostos may be Windows.
+ f_src.close()
+ f_out.close()
+
+ with open(f_src.name, "w") as f:
+ f.write("int main() {}")
+ cmd = f"{compiler_path} -x c -o {f_out.name} {f_src.name}"
if os.popen(cmd).close() is not None:
+ try:
+ os.remove(f_src.name)
+ except OSError:
+ pass
+ try:
+ os.remove(f_out.name)
+ except OSError:
+ pass
# Cannot compile at all, don't skip the test
# so that we report the broken compiler normally.
return None
@@ -1010,12 +1024,21 @@ def is_toolchain_with_mte():
int main() {
void* ptr = __arm_mte_create_random_tag((void*)(0), 0);
}"""
- cmd = "echo '%s' | %s -march=armv8.5-a+memtag -x c -o %s -" % (
- test_src,
- compiler_path,
- f.name,
+ with open(f_src.name, "w") as f:
+ f.write(test_src)
+ cmd = (
+ f"{compiler_path} -march=armv8.5-a+memtag -x c -o {f_out.name} {f_src.name}"
)
- if os.popen(cmd).close() is not None:
+ res = os.popen(cmd).close()
+ try:
+ os.remove(f_src.name)
+ except OSError:
+ pass
+ try:
+ os.remove(f_out.name)
+ except OSError:
+ pass
+ if res is not None:
return "Toolchain does not support MTE"
return None
|
labath
approved these changes
Nov 8, 2024
Comment on lines
1027
to
1028
| with open(f_src.name, "w") as f: | ||
| f.write(test_src) |
There was a problem hiding this comment.
Considered using the subprocess module and passing the contents through the input argument?
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/195/builds/794 Here is the relevant piece of the build log for the reference |
slydiman
added a commit
to slydiman/llvm-project
that referenced
this pull request
Nov 8, 2024
slydiman
added a commit
that referenced
this pull request
Nov 8, 2024
Groverkss
pushed a commit
to iree-org/llvm-project
that referenced
this pull request
Nov 15, 2024
… of Windows host (llvm#115337) Fixed the @skipUnlessAArch64MTELinuxCompiler decorator in case of Windows host.
Groverkss
pushed a commit
to iree-org/llvm-project
that referenced
this pull request
Nov 15, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixed the @skipUnlessAArch64MTELinuxCompiler decorator in case of Windows host.