Fixed Failing Test, and Reverted Usage Behavior Regression

Test was failing due to grep string being invalid, and usage text being
split across multiple lines. The stdout is now joined onto one line so
that grep can find the expected output.

Change-Id: Ied975353c3f511b28bd175c326839eba9dfe2a3e

Author: rowan-walshe

src/gnatcoll-opt_parse.adb

@@ -853,14 +853,16 @@ package body GNATCOLL.Opt_Parse is
       overriding function Usage
         (Self : Option_Parser) return String
       is
+         Usage_Name : constant String :=
+           (if Name /= "" then Name else To_Upper (+Self.Name));
       begin
          if Usage_Text = "" then
             if Long /= "" and Short /= "" then
-               return "[" & Long & "|" & Short & " " & (+Self.Name) & "]";
+               return "[" & Long & "|" & Short & " " & Usage_Name & "]";
             elsif Long /= "" then
-               return "[" & Long & " " & (+Self.Name) & "]";
+               return "[" & Long & " " & Usage_Name & "]";
             end if;
-            return "[" & Short & " " & (+Self.Name) & "]";
+            return "[" & Short & " " & Usage_Name & "]";
          end if;
          return Usage_Text;
       end Usage;

testsuite/tests/opt_parse/usage/parse_output.py

@@ -0,0 +1,5 @@
+import re
+with open("stdout.log", "r") as f:
+   s = " ".join(map(lambda x: x.strip(), f.readlines()))
+with open("stdout.log", "w") as f:
+   f.write(s)

testsuite/tests/opt_parse/usage/test.sh

@@ -2,28 +2,33 @@ STDOUT=stdout.log
 
 ./test > $STDOUT
 
+# The usage text is split across multiple lines making the greps unreliable.
+# This joins together the output onto one line, with correct spaceage in the
+# usage text so that the greps can find the expected text.
+python3 parse_output.py
+
 # Check that the help text contains updated usage information
-if grep -q "[--charset|-C <charset name>]" $STDOUT; then
+if grep -P -q "\[--charset\|-C <charset name>\]" $STDOUT; then
    echo "stdout contained new usage text for option"
 fi
 
-if grep -q "[--day|-D <three letter day of week>]" $STDOUT; then
+if grep -P -q "\[--day\|-D <three letter day of week>\]" $STDOUT; then
    echo "stdout contained new usage text for enum option"
 fi
 
-if grep -q "[--files|-F <list of filepaths to parse>]" $STDOUT; then
+if grep -P -q "\[--files\|-F <list of filepaths to parse>\]" $STDOUT; then
    echo "stdout contained new usage text for option list"
 fi
 
 # Check that the help text contains default usage information
-if grep -q "[--charset2|-C2 CHARSET2]" $STDOUT; then
+if grep -P -q "\[--charset2\|-C2 CHARSET2\]" $STDOUT; then
    echo "stdout contained default usage text for option"
 fi
 
-if grep -q "[--day2|-D2 DAY2]" $STDOUT; then
+if grep -P -q "\[--day2\|-D2 DAY2\]" $STDOUT; then
    echo "stdout contained default usage text for enum option"
 fi
 
-if grep -q "[--files2|-F2 FILES2[FILES2...]]" $STDOUT; then
+if grep -P -q "\[--files2\|-F2 FILES2 \[FILES2...\]\]" $STDOUT; then
    echo "stdout contained default usage text for option list"
 fi