Skip to content

[lldb] Fixed the @skipUnlessAArch64MTELinuxCompiler decorator in case of Windows host #115337

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Nov 8, 2024
Merged

[lldb] Fixed the @skipUnlessAArch64MTELinuxCompiler decorator in case of Windows host #115337

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d9f799f
[lldb] Fixed the @skipUnlessAArch64MTELinuxCompiler decorator in case…
slydiman Nov 7, 2024
d54ea2a
Updated with subprocess.run(cmd, input=...)
slydiman Nov 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 31 additions & 8 deletions lldb/packages/Python/lldbsuite/test/decorators.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
Copy link
Collaborator

@labath labath Nov 8, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Considered using the subprocess module and passing the contents through the input argument?

Copy link
Contributor Author

@slydiman slydiman Nov 8, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated. Thanks.

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

Expand Down
Loading