Skip to content

Commit a8af51d

Browse files
committed
[lldb][test] Skip global module cache on Arm/AArch64 Linux (again)
This reverts commit 01c4ecb, d14d521 and a756dc4. This removes the logging and workaround I added earlier, and puts back the skip for Arm/AArch64 Linux. I've not seen it fail on AArch64 since, but let's not create more noise if it does. I've written up the issue as llvm#76057. It's something to do with trying to destroy a process while a thread is doing a single sep. So my workaround wouldn't have worked in any case. It needs a more involved fix.
1 parent 3dd2db0 commit a8af51d

File tree

2 files changed

+4
-17
lines changed

2 files changed

+4
-17
lines changed

lldb/source/Target/Thread.cpp

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -883,18 +883,6 @@ bool Thread::ShouldStop(Event *event_ptr) {
883883
// If a Controlling Plan wants to stop, we let it. Otherwise, see if
884884
// the plan's parent wants to stop.
885885

886-
// Temporary logging to figure out a crash on Arm/AArch64 Linux.
887-
{
888-
LLDB_LOGF(log, "^^^^^^^^ Thread::ShouldStop plan stack before "
889-
"PopPlan ^^^^^^^^");
890-
StreamString s;
891-
s.IndentMore();
892-
GetProcess()->DumpThreadPlansForTID(
893-
s, GetID(), eDescriptionLevelVerbose, true /* internal */,
894-
false /* condense_trivial */, true /* skip_unreported */);
895-
LLDB_LOG(log, s.GetData());
896-
}
897-
898886
PopPlan();
899887
if (should_stop && current_plan->IsControllingPlan() &&
900888
!current_plan->OkayToDiscard()) {

lldb/test/API/python_api/global_module_cache/TestGlobalModuleCache.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@ def copy_to_main(self, src, dst):
3434
# The rerun tests indicate rerunning on Windows doesn't really work, so
3535
# this one won't either.
3636
@skipIfWindows
37+
# On Arm and AArch64 Linux, this test attempts to pop a thread plan when
38+
# we only have the base plan remaining. Skip it until we can figure out
39+
# the bug this is exposing (https://github.com/llvm/llvm-project/issues/76057).
40+
@skipIf(oslist=["linux"], archs=["arm", "aarch64"])
3741
def test_OneTargetOneDebugger(self):
3842
self.do_test(True, True)
3943

@@ -50,11 +54,6 @@ def test_OneTargetTwoDebuggers(self):
5054
self.do_test(True, False)
5155

5256
def do_test(self, one_target, one_debugger):
53-
# Here to debug flakiness on Arm, remove later!
54-
log_cmd_result = lldb.SBCommandReturnObject()
55-
interp = self.dbg.GetCommandInterpreter()
56-
interp.HandleCommand("log enable lldb step", log_cmd_result)
57-
5857
# Make sure that if we have one target, and we run, then
5958
# change the binary and rerun, the binary (and any .o files
6059
# if using dwarf in .o file debugging) get removed from the

0 commit comments

Comments
 (0)