numfmt: fix ERR_SUBST patterns in GNU test patch for line-by-line processing

Author: sylvestre

util/gnu-patches/tests_numfmt.patch

@@ -29,28 +29,28 @@ Index: gnu/tests/numfmt/numfmt.pl
       ['field-range-err-6', '--field - --field 1- --to=si 10',
 -             {EXIT=>1}, {ERR=>"$prog: multiple field specifications\n"}],
 +             {EXIT=>1},
-+             {ERR_SUBST=>"s/\n.*//s"},
-+             {ERR=>"error: the argument '--field <FIELDS>' cannot be used multiple times"}],
++             {ERR_SUBST=>"s/^(?!error:).*\\n?//"},
++             {ERR=>"error: the argument '--field <FIELDS>' cannot be used multiple times\n"}],
       ['field-range-err-7', '--field -1 --field 1- --to=si 10',
 -             {EXIT=>1}, {ERR=>"$prog: multiple field specifications\n"}],
 +             {EXIT=>1},
-+             {ERR_SUBST=>"s/\n.*//s"},
-+             {ERR=>"error: the argument '--field <FIELDS>' cannot be used multiple times"}],
++             {ERR_SUBST=>"s/^(?!error:).*\\n?//"},
++             {ERR=>"error: the argument '--field <FIELDS>' cannot be used multiple times\n"}],
       ['field-range-err-8', '--field -1 --field 1,2,3 --to=si 10',
 -             {EXIT=>1}, {ERR=>"$prog: multiple field specifications\n"}],
 +             {EXIT=>1},
-+             {ERR_SUBST=>"s/\n.*//s"},
-+             {ERR=>"error: the argument '--field <FIELDS>' cannot be used multiple times"}],
++             {ERR_SUBST=>"s/^(?!error:).*\\n?//"},
++             {ERR=>"error: the argument '--field <FIELDS>' cannot be used multiple times\n"}],
       ['field-range-err-9', '--field 1- --field 1,2,3 --to=si 10',
 -             {EXIT=>1}, {ERR=>"$prog: multiple field specifications\n"}],
 +             {EXIT=>1},
-+             {ERR_SUBST=>"s/\n.*//s"},
-+             {ERR=>"error: the argument '--field <FIELDS>' cannot be used multiple times"}],
++             {ERR_SUBST=>"s/^(?!error:).*\\n?//"},
++             {ERR=>"error: the argument '--field <FIELDS>' cannot be used multiple times\n"}],
       ['field-range-err-10','--field 1,2,3 --field 1- --to=si 10',
 -             {EXIT=>1}, {ERR=>"$prog: multiple field specifications\n"}],
 +             {EXIT=>1},
-+             {ERR_SUBST=>"s/\n.*//s"},
-+             {ERR=>"error: the argument '--field <FIELDS>' cannot be used multiple times"}],
++             {ERR_SUBST=>"s/^(?!error:).*\\n?//"},
++             {ERR=>"error: the argument '--field <FIELDS>' cannot be used multiple times\n"}],
       ['field-range-err-11','--field 1-2-3 --to=si 10',
 -             {EXIT=>1}, {ERR=>"$prog: invalid field range\n$try"}],
 +             {EXIT=>1}, {ERR=>"$prog: range '1-2-3' was invalid: failed to parse range\n"}],
@@ -113,17 +113,8 @@ Index: gnu/tests/numfmt/numfmt.pl
       ['help-1', '--foobar',
 -             {ERR=>"$prog: unrecognized option\n$try"},
 -             {ERR_SUBST=>"s/option.*/option/; s/unknown/unrecognized/"},
-+             {ERR=>"error: unexpected argument '--foobar' found"},
-+             {ERR_SUBST=>"s/\n.*//s"},
++             {ERR=>"error: unexpected argument '--foobar' found\n"},
++             {ERR_SUBST=>"s/^(?!error:).*\\n?//"},
               {EXIT=>1}],
 
       ## Format string - check error detection
-@@ -1097,7 +1106,7 @@ my @Limit_Tests =
-              {EXIT => 2}],
-   );
- # Restrict these tests to systems with LDBL_DIG == 18
--(system "$prog ---debug 1 2>&1|grep 'MAX_UNSCALED_DIGITS: 18' > /dev/null") == 0
-+(system "$prog --debug 1 2>&1|grep 'MAX_UNSCALED_DIGITS: 18' > /dev/null") == 0
-   and push @Tests, @Limit_Tests;
-
- my $lg = ' ';