Skip to content

Commit adb146f

Browse files
committed
Fix non-deterministic title case
1 parent 458707c commit adb146f

File tree

2 files changed

+3
-7
lines changed

2 files changed

+3
-7
lines changed

lldb/test/API/tools/lldb-dap/progress/TestDAP_Progress.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ def test_output(self):
5151
program = self.getBuildArtifact("a.out")
5252
self.build_and_launch(program)
5353
progress_emitter = os.path.join(os.getcwd(), "Progress_emitter.py")
54-
print(f"Progress emitter path: {progress_emitter}")
5554
source = "main.cpp"
5655
breakpoint_ids = self.set_source_breakpoints(
5756
source, [line_number(source, "// break here")]
@@ -74,7 +73,6 @@ def test_output_nodetails(self):
7473
program = self.getBuildArtifact("a.out")
7574
self.build_and_launch(program)
7675
progress_emitter = os.path.join(os.getcwd(), "Progress_emitter.py")
77-
print(f"Progress emitter path: {progress_emitter}")
7876
source = "main.cpp"
7977
breakpoint_ids = self.set_source_breakpoints(
8078
source, [line_number(source, "// break here")]
@@ -97,7 +95,6 @@ def test_output_indeterminate(self):
9795
program = self.getBuildArtifact("a.out")
9896
self.build_and_launch(program)
9997
progress_emitter = os.path.join(os.getcwd(), "Progress_emitter.py")
100-
print(f"Progress emitter path: {progress_emitter}")
10198
source = "main.cpp"
10299
breakpoint_ids = self.set_source_breakpoints(
103100
source, [line_number(source, "// break here")]
@@ -109,7 +106,7 @@ def test_output_indeterminate(self):
109106
self.dap_server.request_evaluate("`test-progress --seconds 1", context="repl")
110107

111108
self.verify_progress_events(
112-
expected_title="Progress tester",
109+
expected_title="Progress tester: Initial Indeterminate Detail",
113110
expected_message="Step 1",
114111
only_verify_first_update=True,
115112
)
@@ -119,7 +116,6 @@ def test_output_nodetails_indeterminate(self):
119116
program = self.getBuildArtifact("a.out")
120117
self.build_and_launch(program)
121118
progress_emitter = os.path.join(os.getcwd(), "Progress_emitter.py")
122-
print(f"Progress emitter path: {progress_emitter}")
123119
source = "main.cpp"
124120
breakpoint_ids = self.set_source_breakpoints(
125121
source, [line_number(source, "// break here")]
@@ -133,7 +129,7 @@ def test_output_nodetails_indeterminate(self):
133129
)
134130

135131
self.verify_progress_events(
136-
expected_title="Progress tester",
132+
expected_title="Progress tester: Initial Indeterminate Detail",
137133
expected_message="Initial Indeterminate Detail",
138134
only_verify_first_update=True,
139135
)

lldb/tools/lldb-dap/Handler/InitializeRequestHandler.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ void ProgressEventThreadFunction(DAP &dap) {
7070
GetStringFromStructuredData(data, "details");
7171

7272
if (completed == 0) {
73-
if (total == 1) {
73+
if (total == UINT64_MAX) {
7474
// This progress is non deterministic and won't get updated until it
7575
// is completed. Send the "message" which will be the combined title
7676
// and detail. The only other progress event for thus

0 commit comments

Comments
 (0)