[Lldb-commits] [lldb] [lldb][Progress] Fix test for trimmed progress reports (PR #78357)

[Chelsea Cassanova via lldb-commits]

https://github.com/chelcassanova created https://github.com/llvm/llvm-project/pull/78357

The test TestTrimmedProgressReporting tests that progress reports are being sent by listening for events with the titles of specific progress reports. Commit f1ef910b removed the report for Apple DWARF indices which was one of the reports being listened for in this test, so that report is removed here as well.

That commit also now creates all progress reports with details so reports string are prepended with the details count. This changes the length of the trimmed progress report title string that's checked for here so this commit changes the string to match as well.

This test was skipped on non-Apple platforms, but since the progress report for Apple DWARF indices has been removed this commit removes that decorator.

>From e232f553186f6f63f5fd4a85b6747e0f3838b3dc Mon Sep 17 00:00:00 2001
From: Chelsea Cassanova <chelsea_cassanova at apple.com>
Date: Tue, 16 Jan 2024 13:51:10 -0800
Subject: [PATCH] [lldb][Progress] Fix test for trimmed progress reports

The test TestTrimmedProgressReporting tests that progress reports are
being sent by listening for events with the titles of specific progress
reports. Commit f1ef910b removed the report for Apple DWARF indices
which was one of the reports being listened for in this test, so that
report is removed here as well.

That commit also now creates all progress reports with details so
reports string are prepended with the details count. This changes the length of
the trimmed progress report title string that's checked for here so this
commit changes the string to match as well.

This test was skipped on non-Apple platforms, but since the progress
report for Apple DWARF indices has been removed this commit removes that
decorator.
---
 .../progress_reporting/TestTrimmedProgressReporting.py   | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/lldb/test/API/functionalities/progress_reporting/TestTrimmedProgressReporting.py b/lldb/test/API/functionalities/progress_reporting/TestTrimmedProgressReporting.py
index c4ff30a75a7aec..24240d68e5ea64 100644
--- a/lldb/test/API/functionalities/progress_reporting/TestTrimmedProgressReporting.py
+++ b/lldb/test/API/functionalities/progress_reporting/TestTrimmedProgressReporting.py
@@ -33,24 +33,21 @@ def do_test(self, term_width, pattern_list):
     # PExpect uses many timeouts internally and doesn't play well
     # under ASAN on a loaded machine..
     @skipIfAsan
-    @skipUnlessDarwin
     @skipIfEditlineSupportMissing
     def test_trimmed_progress_message(self):
         self.do_test(
-            19, ["Locating externa...", "Loading Apple DW...", "Parsing symbol t..."]
+            19, ["Locating e...", "Parsing sy..."]
         )
 
     # PExpect uses many timeouts internally and doesn't play well
     # under ASAN on a loaded machine..
     @skipIfAsan
-    @skipUnlessDarwin
     @skipIfEditlineSupportMissing
     def test_long_progress_message(self):
         self.do_test(
             80,
             [
-                "Locating external symbol file for a.out...",
-                "Loading Apple DWARF index for a.out...",
-                "Parsing symbol table for dyld...",
+                "Locating external symbol file",
+                "Parsing symbol table",
             ],
         )