Skip to content

Commit d4ab02b

Browse files
Merge branch 'topic/als.1314.format_option_tester_name_issue' into 'master'
Fix missmatch option name in tester See merge request eng/ide/ada_language_server!1524
2 parents 0eaa8e2 + 62e1584 commit d4ab02b

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

source/tester/tester-run.adb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ procedure Tester.Run is
5151

5252
Output_Format : constant VSS.Command_Line.Value_Option :=
5353
(Short_Name => "",
54-
Long_Name => "output-format",
54+
Long_Name => "format",
5555
Value_Name => "output_format_option",
5656
Description =>
5757
VSS.Strings.Conversions.To_Virtual_String

source/tester/tester-tests.adb

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1259,15 +1259,19 @@ package body Tester.Tests is
12591259
Text.Append ("Recent output from server:");
12601260
Text.Append (GNATCOLL.JSON.Write (Output, False));
12611261

1262-
else -- Default behaviour is "diff"
1262+
else
1263+
if On_Failed_Val /= "diff" then
1264+
Text.Append
1265+
("Unrecognized value for Format: reverting to ""diff""");
1266+
end if;
12631267
declare
12641268
Diff : Unbounded_String;
12651269
begin
12661270
Diff := Generate_Diff
12671271
(Left => Output,
12681272
Right => Waits,
12691273
Indent => 0,
1270-
Minimal => True);
1274+
Minimal => False);
12711275
Text.Append ("Diff:");
12721276
Text.Append (To_String (Diff));
12731277
end;

0 commit comments

Comments
 (0)