Skip to content

Commit 409476d

Browse files
committed
[lldb/crashlog] Remove aarch64 requirement on crashlog tests (llvm#94553)
This PR removes the `target-aarch64` requirement on the crashlog tests to exercice them on Intel bots and make image loading single-threaded temporarily while implementing a fix for a deadlock issue when loading the images in parallel. Signed-off-by: Med Ismail Bennani <[email protected]> (cherry picked from commit d09231a)
1 parent c7aa624 commit 409476d

8 files changed

+12
-6
lines changed

lldb/examples/python/crashlog.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1808,6 +1808,9 @@ def SymbolicateCrashLogs(debugger, command_args, result, is_command):
18081808
)
18091809
)
18101810

1811+
if "NO_PARALLEL_IMG_LOADING" in os.environ:
1812+
options.no_parallel_image_loading = True
1813+
18111814
if options.version:
18121815
print(debugger.GetVersionString())
18131816
return

lldb/test/Shell/ScriptInterpreter/Python/Crashlog/app_specific_backtrace_crashlog.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# REQUIRES: python, native && target-aarch64 && system-darwin
1+
# REQUIRES: python, native && system-darwin
22

33
# RUN: mkdir -p %t.dir
44
# RUN: yaml2obj %S/Inputs/application_specific_info/asi.yaml > %t.dir/asi

lldb/test/Shell/ScriptInterpreter/Python/Crashlog/interactive_crashlog_invalid_target.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# REQUIRES: python, native && target-aarch64 && system-darwin
1+
# REQUIRES: python, native && system-darwin
22

33
# RUN: %lldb -o 'command script import lldb.macosx.crashlog' \
44
# RUN: -o 'crashlog -V' \

lldb/test/Shell/ScriptInterpreter/Python/Crashlog/interactive_crashlog_json.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# REQUIRES: python, native && target-aarch64 && system-darwin
1+
# REQUIRES: python, native && system-darwin
22

33
# RUN: mkdir -p %t.dir
44
# RUN: yaml2obj %S/Inputs/interactive_crashlog/multithread-test.yaml > %t.dir/multithread-test

lldb/test/Shell/ScriptInterpreter/Python/Crashlog/interactive_crashlog_legacy.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# REQUIRES: python, native && target-aarch64 && system-darwin
1+
# REQUIRES: python, native && system-darwin
22

33
# RUN: mkdir -p %t.dir
44
# RUN: yaml2obj %S/Inputs/interactive_crashlog/multithread-test.yaml > %t.dir/multithread-test

lldb/test/Shell/ScriptInterpreter/Python/Crashlog/last_exception_backtrace_crashlog.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# REQUIRES: python, native && target-aarch64 && system-darwin
1+
# REQUIRES: python, native && system-darwin
22

33
# RUN: mkdir -p %t.dir
44
# RUN: yaml2obj %S/Inputs/application_specific_info/asi.yaml > %t.dir/asi

lldb/test/Shell/ScriptInterpreter/Python/Crashlog/lit.local.cfg

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,6 @@ if 'lldb-repro' in config.available_features:
55
config.unsupported = True
66

77
config.environment["LLDB_APPLE_DSYMFORUUID_EXECUTABLE"] = ""
8+
9+
# Temporary parallel image loading deadlock workaround
10+
config.environment["NO_PARALLEL_IMG_LOADING"] = ""

lldb/test/Shell/ScriptInterpreter/Python/Crashlog/skipped_status_interactive_crashlog.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# REQUIRES: python, native && target-aarch64 && system-darwin
1+
# REQUIRES: python, native && system-darwin
22

33
# RUN: mkdir -p %t.dir
44
# RUN: yaml2obj %S/Inputs/interactive_crashlog/multithread-test.yaml > %t.dir/multithread-test

0 commit comments

Comments
 (0)