[PATCH v4 11/12] stdio-common: Add tests for formatted vsprintf output specifiers
DJ Delorie
dj@redhat.com
Sat Nov 2 02:47:39 GMT 2024
LGTM
Reviewed-by: DJ Delorie <dj@redhat.com>
"Maciej W. Rozycki" <macro@orcam.me.uk> writes:
> Index: glibc/stdio-common/Makefile
>
> # List of markers for printf family function tests.
> -xprintf-funcs := p as d f s sn v vas vd vf
> +xprintf-funcs := p as d f s sn v vas vd vf vs
I'm starting to sense a pattern here... ;-)
Ok.
> Index: glibc/stdio-common/tst-printf-format-vs-c.c
> ===================================================================
> --- /dev/null
> +++ glibc/stdio-common/tst-printf-format-vs-c.c
> @@ -0,0 +1,20 @@
> +/* Test for formatted 'vsprintf' output for the 'c' conversion.
> + Copyright (C) 2024 Free Software Foundation, Inc.
> + This file is part of the GNU C Library.
> +
> + The GNU C Library is free software; you can redistribute it and/or
> + modify it under the terms of the GNU Lesser General Public
> + License as published by the Free Software Foundation; either
> + version 2.1 of the License, or (at your option) any later version.
> +
> + The GNU C Library is distributed in the hope that it will be useful,
> + but WITHOUT ANY WARRANTY; without even the implied warranty of
> + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> + Lesser General Public License for more details.
> +
> + You should have received a copy of the GNU Lesser General Public
> + License along with the GNU C Library; if not, see
> + <https://www.gnu.org/licenses/>. */
> +
> +#include "tst-printf-format-vs.h"
> +#include "tst-printf-format-skeleton-c.c"
Ok.
> Index: glibc/stdio-common/tst-printf-format-vs-char.c
> ===================================================================
> --- /dev/null
> +++ glibc/stdio-common/tst-printf-format-vs-char.c
> @@ -0,0 +1,20 @@
> +/* Test for formatted 'vsprintf' output for signed char conversions.
> + Copyright (C) 2024 Free Software Foundation, Inc.
> + This file is part of the GNU C Library.
> +
> + The GNU C Library is free software; you can redistribute it and/or
> + modify it under the terms of the GNU Lesser General Public
> + License as published by the Free Software Foundation; either
> + version 2.1 of the License, or (at your option) any later version.
> +
> + The GNU C Library is distributed in the hope that it will be useful,
> + but WITHOUT ANY WARRANTY; without even the implied warranty of
> + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> + Lesser General Public License for more details.
> +
> + You should have received a copy of the GNU Lesser General Public
> + License along with the GNU C Library; if not, see
> + <https://www.gnu.org/licenses/>. */
> +
> +#include "tst-printf-format-vs.h"
> +#include "tst-printf-format-skeleton-char.c"
Ok.
> Index: glibc/stdio-common/tst-printf-format-vs-double.c
> ===================================================================
> --- /dev/null
> +++ glibc/stdio-common/tst-printf-format-vs-double.c
> @@ -0,0 +1,20 @@
> +/* Test for formatted 'vsprintf' output for double conversions.
> + Copyright (C) 2024 Free Software Foundation, Inc.
> + This file is part of the GNU C Library.
> +
> + The GNU C Library is free software; you can redistribute it and/or
> + modify it under the terms of the GNU Lesser General Public
> + License as published by the Free Software Foundation; either
> + version 2.1 of the License, or (at your option) any later version.
> +
> + The GNU C Library is distributed in the hope that it will be useful,
> + but WITHOUT ANY WARRANTY; without even the implied warranty of
> + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> + Lesser General Public License for more details.
> +
> + You should have received a copy of the GNU Lesser General Public
> + License along with the GNU C Library; if not, see
> + <https://www.gnu.org/licenses/>. */
> +
> +#include "tst-printf-format-vs.h"
> +#include "tst-printf-format-skeleton-double.c"
Ok.
> Index: glibc/stdio-common/tst-printf-format-vs-int.c
> ===================================================================
> --- /dev/null
> +++ glibc/stdio-common/tst-printf-format-vs-int.c
> @@ -0,0 +1,20 @@
> +/* Test for formatted 'vsprintf' output for int conversions.
> + Copyright (C) 2024 Free Software Foundation, Inc.
> + This file is part of the GNU C Library.
> +
> + The GNU C Library is free software; you can redistribute it and/or
> + modify it under the terms of the GNU Lesser General Public
> + License as published by the Free Software Foundation; either
> + version 2.1 of the License, or (at your option) any later version.
> +
> + The GNU C Library is distributed in the hope that it will be useful,
> + but WITHOUT ANY WARRANTY; without even the implied warranty of
> + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> + Lesser General Public License for more details.
> +
> + You should have received a copy of the GNU Lesser General Public
> + License along with the GNU C Library; if not, see
> + <https://www.gnu.org/licenses/>. */
> +
> +#include "tst-printf-format-vs.h"
> +#include "tst-printf-format-skeleton-int.c"
Ok.
> Index: glibc/stdio-common/tst-printf-format-vs-ldouble.c
> ===================================================================
> --- /dev/null
> +++ glibc/stdio-common/tst-printf-format-vs-ldouble.c
> @@ -0,0 +1,20 @@
> +/* Test for formatted 'vsprintf' output for long double conversions.
> + Copyright (C) 2024 Free Software Foundation, Inc.
> + This file is part of the GNU C Library.
> +
> + The GNU C Library is free software; you can redistribute it and/or
> + modify it under the terms of the GNU Lesser General Public
> + License as published by the Free Software Foundation; either
> + version 2.1 of the License, or (at your option) any later version.
> +
> + The GNU C Library is distributed in the hope that it will be useful,
> + but WITHOUT ANY WARRANTY; without even the implied warranty of
> + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> + Lesser General Public License for more details.
> +
> + You should have received a copy of the GNU Lesser General Public
> + License along with the GNU C Library; if not, see
> + <https://www.gnu.org/licenses/>. */
> +
> +#include "tst-printf-format-vs.h"
> +#include "tst-printf-format-skeleton-ldouble.c"
Ok.
> Index: glibc/stdio-common/tst-printf-format-vs-llong.c
> ===================================================================
> --- /dev/null
> +++ glibc/stdio-common/tst-printf-format-vs-llong.c
> @@ -0,0 +1,20 @@
> +/* Test for formatted 'vsprintf' output for long long int conversions.
> + Copyright (C) 2024 Free Software Foundation, Inc.
> + This file is part of the GNU C Library.
> +
> + The GNU C Library is free software; you can redistribute it and/or
> + modify it under the terms of the GNU Lesser General Public
> + License as published by the Free Software Foundation; either
> + version 2.1 of the License, or (at your option) any later version.
> +
> + The GNU C Library is distributed in the hope that it will be useful,
> + but WITHOUT ANY WARRANTY; without even the implied warranty of
> + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> + Lesser General Public License for more details.
> +
> + You should have received a copy of the GNU Lesser General Public
> + License along with the GNU C Library; if not, see
> + <https://www.gnu.org/licenses/>. */
> +
> +#include "tst-printf-format-vs.h"
> +#include "tst-printf-format-skeleton-llong.c"
Ok.
> Index: glibc/stdio-common/tst-printf-format-vs-long.c
> ===================================================================
> --- /dev/null
> +++ glibc/stdio-common/tst-printf-format-vs-long.c
> @@ -0,0 +1,20 @@
> +/* Test for formatted 'vsprintf' output for long int conversions.
> + Copyright (C) 2024 Free Software Foundation, Inc.
> + This file is part of the GNU C Library.
> +
> + The GNU C Library is free software; you can redistribute it and/or
> + modify it under the terms of the GNU Lesser General Public
> + License as published by the Free Software Foundation; either
> + version 2.1 of the License, or (at your option) any later version.
> +
> + The GNU C Library is distributed in the hope that it will be useful,
> + but WITHOUT ANY WARRANTY; without even the implied warranty of
> + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> + Lesser General Public License for more details.
> +
> + You should have received a copy of the GNU Lesser General Public
> + License along with the GNU C Library; if not, see
> + <https://www.gnu.org/licenses/>. */
> +
> +#include "tst-printf-format-vs.h"
> +#include "tst-printf-format-skeleton-long.c"
Ok.
> Index: glibc/stdio-common/tst-printf-format-vs-s.c
> ===================================================================
> --- /dev/null
> +++ glibc/stdio-common/tst-printf-format-vs-s.c
> @@ -0,0 +1,20 @@
> +/* Test for formatted 'vsprintf' output for the 's' conversion.
> + Copyright (C) 2024 Free Software Foundation, Inc.
> + This file is part of the GNU C Library.
> +
> + The GNU C Library is free software; you can redistribute it and/or
> + modify it under the terms of the GNU Lesser General Public
> + License as published by the Free Software Foundation; either
> + version 2.1 of the License, or (at your option) any later version.
> +
> + The GNU C Library is distributed in the hope that it will be useful,
> + but WITHOUT ANY WARRANTY; without even the implied warranty of
> + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> + Lesser General Public License for more details.
> +
> + You should have received a copy of the GNU Lesser General Public
> + License along with the GNU C Library; if not, see
> + <https://www.gnu.org/licenses/>. */
> +
> +#include "tst-printf-format-vs.h"
> +#include "tst-printf-format-skeleton-s.c"
Ok.
> Index: glibc/stdio-common/tst-printf-format-vs-short.c
> ===================================================================
> --- /dev/null
> +++ glibc/stdio-common/tst-printf-format-vs-short.c
> @@ -0,0 +1,20 @@
> +/* Test for formatted 'vsprintf' output for short int conversions.
> + Copyright (C) 2024 Free Software Foundation, Inc.
> + This file is part of the GNU C Library.
> +
> + The GNU C Library is free software; you can redistribute it and/or
> + modify it under the terms of the GNU Lesser General Public
> + License as published by the Free Software Foundation; either
> + version 2.1 of the License, or (at your option) any later version.
> +
> + The GNU C Library is distributed in the hope that it will be useful,
> + but WITHOUT ANY WARRANTY; without even the implied warranty of
> + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> + Lesser General Public License for more details.
> +
> + You should have received a copy of the GNU Lesser General Public
> + License along with the GNU C Library; if not, see
> + <https://www.gnu.org/licenses/>. */
> +
> +#include "tst-printf-format-vs.h"
> +#include "tst-printf-format-skeleton-short.c"
Ok.
> Index: glibc/stdio-common/tst-printf-format-vs-uchar.c
> ===================================================================
> --- /dev/null
> +++ glibc/stdio-common/tst-printf-format-vs-uchar.c
> @@ -0,0 +1,20 @@
> +/* Test for formatted 'vsprintf' output for unsigned char conversions.
> + Copyright (C) 2024 Free Software Foundation, Inc.
> + This file is part of the GNU C Library.
> +
> + The GNU C Library is free software; you can redistribute it and/or
> + modify it under the terms of the GNU Lesser General Public
> + License as published by the Free Software Foundation; either
> + version 2.1 of the License, or (at your option) any later version.
> +
> + The GNU C Library is distributed in the hope that it will be useful,
> + but WITHOUT ANY WARRANTY; without even the implied warranty of
> + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> + Lesser General Public License for more details.
> +
> + You should have received a copy of the GNU Lesser General Public
> + License along with the GNU C Library; if not, see
> + <https://www.gnu.org/licenses/>. */
> +
> +#include "tst-printf-format-vs.h"
> +#include "tst-printf-format-skeleton-uchar.c"
Ok.
> Index: glibc/stdio-common/tst-printf-format-vs-uint.c
> ===================================================================
> --- /dev/null
> +++ glibc/stdio-common/tst-printf-format-vs-uint.c
> @@ -0,0 +1,20 @@
> +/* Test for formatted 'vsprintf' output for unsigned int conversions.
> + Copyright (C) 2024 Free Software Foundation, Inc.
> + This file is part of the GNU C Library.
> +
> + The GNU C Library is free software; you can redistribute it and/or
> + modify it under the terms of the GNU Lesser General Public
> + License as published by the Free Software Foundation; either
> + version 2.1 of the License, or (at your option) any later version.
> +
> + The GNU C Library is distributed in the hope that it will be useful,
> + but WITHOUT ANY WARRANTY; without even the implied warranty of
> + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> + Lesser General Public License for more details.
> +
> + You should have received a copy of the GNU Lesser General Public
> + License along with the GNU C Library; if not, see
> + <https://www.gnu.org/licenses/>. */
> +
> +#include "tst-printf-format-vs.h"
> +#include "tst-printf-format-skeleton-uint.c"
Ok.
> Index: glibc/stdio-common/tst-printf-format-vs-ullong.c
> ===================================================================
> --- /dev/null
> +++ glibc/stdio-common/tst-printf-format-vs-ullong.c
> @@ -0,0 +1,20 @@
> +/* Test for formatted 'vsprintf' output for unsigned long long int conversions.
> + Copyright (C) 2024 Free Software Foundation, Inc.
> + This file is part of the GNU C Library.
> +
> + The GNU C Library is free software; you can redistribute it and/or
> + modify it under the terms of the GNU Lesser General Public
> + License as published by the Free Software Foundation; either
> + version 2.1 of the License, or (at your option) any later version.
> +
> + The GNU C Library is distributed in the hope that it will be useful,
> + but WITHOUT ANY WARRANTY; without even the implied warranty of
> + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> + Lesser General Public License for more details.
> +
> + You should have received a copy of the GNU Lesser General Public
> + License along with the GNU C Library; if not, see
> + <https://www.gnu.org/licenses/>. */
> +
> +#include "tst-printf-format-vs.h"
> +#include "tst-printf-format-skeleton-ullong.c"
Ok.
> Index: glibc/stdio-common/tst-printf-format-vs-ulong.c
> ===================================================================
> --- /dev/null
> +++ glibc/stdio-common/tst-printf-format-vs-ulong.c
> @@ -0,0 +1,20 @@
> +/* Test for formatted 'vsprintf' output for unsigned long int conversions.
> + Copyright (C) 2024 Free Software Foundation, Inc.
> + This file is part of the GNU C Library.
> +
> + The GNU C Library is free software; you can redistribute it and/or
> + modify it under the terms of the GNU Lesser General Public
> + License as published by the Free Software Foundation; either
> + version 2.1 of the License, or (at your option) any later version.
> +
> + The GNU C Library is distributed in the hope that it will be useful,
> + but WITHOUT ANY WARRANTY; without even the implied warranty of
> + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> + Lesser General Public License for more details.
> +
> + You should have received a copy of the GNU Lesser General Public
> + License along with the GNU C Library; if not, see
> + <https://www.gnu.org/licenses/>. */
> +
> +#include "tst-printf-format-vs.h"
> +#include "tst-printf-format-skeleton-ulong.c"
Ok.
> Index: glibc/stdio-common/tst-printf-format-vs-ushort.c
> ===================================================================
> --- /dev/null
> +++ glibc/stdio-common/tst-printf-format-vs-ushort.c
> @@ -0,0 +1,20 @@
> +/* Test for formatted 'vsprintf' output for unsigned short int conversions.
> + Copyright (C) 2024 Free Software Foundation, Inc.
> + This file is part of the GNU C Library.
> +
> + The GNU C Library is free software; you can redistribute it and/or
> + modify it under the terms of the GNU Lesser General Public
> + License as published by the Free Software Foundation; either
> + version 2.1 of the License, or (at your option) any later version.
> +
> + The GNU C Library is distributed in the hope that it will be useful,
> + but WITHOUT ANY WARRANTY; without even the implied warranty of
> + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> + Lesser General Public License for more details.
> +
> + You should have received a copy of the GNU Lesser General Public
> + License along with the GNU C Library; if not, see
> + <https://www.gnu.org/licenses/>. */
> +
> +#include "tst-printf-format-vs.h"
> +#include "tst-printf-format-skeleton-ushort.c"
Ok.
> Index: glibc/stdio-common/tst-printf-format-vs.h
> ===================================================================
> --- /dev/null
> +++ glibc/stdio-common/tst-printf-format-vs.h
> @@ -0,0 +1,64 @@
> +/* Test feature wrapper for formatted 'vsprintf' output.
> + Copyright (C) 2024 Free Software Foundation, Inc.
> + This file is part of the GNU C Library.
> +
> + The GNU C Library is free software; you can redistribute it and/or
> + modify it under the terms of the GNU Lesser General Public
> + License as published by the Free Software Foundation; either
> + version 2.1 of the License, or (at your option) any later version.
> +
> + The GNU C Library is distributed in the hope that it will be useful,
> + but WITHOUT ANY WARRANTY; without even the implied warranty of
> + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> + Lesser General Public License for more details.
> +
> + You should have received a copy of the GNU Lesser General Public
> + License along with the GNU C Library; if not, see
> + <https://www.gnu.org/licenses/>. */
> +
> +#include <stdarg.h>
> +#include <stdio.h>
> +#include <stdlib.h>
> +
> +#include <support/next_to_fault.h>
> +
> +#define SPRINTF_BUFFER_SIZE 65536
> +
> +static struct support_next_to_fault ntf;
> +
> +#define PREPARE printf_under_test_init
> +static void
> +printf_under_test_init (int argc, char **argv)
> +{
> + ntf = support_next_to_fault_allocate (SPRINTF_BUFFER_SIZE);
> +}
> +
> +static void __attribute__ ((destructor))
> +printf_under_test_fini (void)
> +{
> + support_next_to_fault_free (&ntf);
> +}
> +
> +static int
> +printf_under_test (const char *restrict fmt, ...)
> +{
> + char *str = ntf.buffer;
> + va_list ap;
> + int result;
> +
> + va_start (ap, fmt);
> + result = vsprintf (str, fmt, ap);
> + va_end (ap);
> + if (result < 0)
> + {
> + perror ("vsprintf");
> + goto out;
> + }
> + if (fwrite (str, sizeof (*str), result, stdout) != result)
> + {
> + perror ("fwrite");
> + result = -1;
> + }
> +out:
> + return result;
> +}
Ok.
More information about the Libc-alpha
mailing list