This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
Re: [PATCH] Fix posix/tst-regex by using ISO-8859 encoding for ChangeLog.8.
On 8/27/19 6:18 AM, Stefan Liebler wrote:
> commit a6af326cb423f6f2ae7475b1619807e83c7e9ae6
> Author: Stefan Liebler <stli@linux.ibm.com>
> Date: Tue Aug 27 09:11:32 2019 +0200
>
> Fix posix/tst-regex by using a dedicated input-file.
>
> The recent commit e6855a3bdfe147c52b29b5e7d70a95a8aa22ece0
> changed the encoding of ChangeLog.old/ChangeLog.8 from ISO-8859 to UTF-8.
> Unfortunately the test posix/tst-regex assumes the former encoding.
> Furthermore Francesco Potortì is now written with 'ì' instead of 'i`'
> which would lead to two further matches in the first call to test_expr.
>
> This patch just copies the former ChangeLog.8 file to tst-regex.input
> and adjusts the test in order to use this new input file.
>
> ChangeLog:
>
> * posix/tst-regex.c (do_test): Use tst-regex.input as input file.
> * posix/tst-regex.input: New file.
>
> diff --git a/posix/tst-regex.c b/posix/tst-regex.c
> index fe05da9b63..c5d802625a 100644
> --- a/posix/tst-regex.c
> +++ b/posix/tst-regex.c
> @@ -67,7 +67,7 @@ do_test (void)
> mtrace ();
>
> /* Make the content of the file available in memory. */
> - file = "../ChangeLog.old/ChangeLog.8";
> + file = "./tst-regex.input";
> fd = open (file, O_RDONLY);
> if (fd == -1)
> error (EXIT_FAILURE, errno, "cannot open %s", basename (file));
Sorry, I missed Zack's feedback on this already. This looks good.
Good for master.
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
--
Cheers,
Carlos.