diff --git a/lldb/test/API/commands/watchpoints/watch_tagged_addr/TestWatchTaggedAddress.py b/lldb/test/API/commands/watchpoints/watch_tagged_addr/TestWatchTaggedAddress.py --- a/lldb/test/API/commands/watchpoints/watch_tagged_addr/TestWatchTaggedAddress.py +++ b/lldb/test/API/commands/watchpoints/watch_tagged_addr/TestWatchTaggedAddress.py @@ -129,12 +129,15 @@ substrs=["stop reason = watchpoint"], ) + # Use the '-v' option to do verbose listing of the watchpoint. + # The hit count should now be 2. + self.expect("watchpoint list -v", substrs=["hit_count = 2"]) + + # On some hardware, during __do_global_dtors_aux a flag is set near + # the global which can trigger the watchpoint. So we must remove it. + self.runCmd("watchpoint delete 1") self.runCmd("process continue") # There should be no more watchpoint hit and the process status should # be 'exited'. self.expect("process status", substrs=["exited"]) - - # Use the '-v' option to do verbose listing of the watchpoint. - # The hit count should now be 2. - self.expect("watchpoint list -v", substrs=["hit_count = 2"])