[PATCH v4 02/12] stdio-common: Add tests for formatted asprintf output specifiers
DJ Delorie
dj@redhat.com
Sat Nov 2 01:26:24 GMT 2024
LGTM
Reviewed-by: DJ Delorie <dj@redhat.com>
"Maciej W. Rozycki" <macro@orcam.me.uk> writes:
> Index: glibc/stdio-common/Makefile
> ===================================================================
> --- glibc.orig/stdio-common/Makefile
> +++ glibc/stdio-common/Makefile
> @@ -23,7 +23,7 @@ subdir := stdio-common
> include ../Makeconfig
>
> # List of markers for printf family function tests.
> -xprintf-funcs := p
> +xprintf-funcs := p as
Ok.
> Index: glibc/stdio-common/tst-printf-format-as-c.c
> ===================================================================
> --- /dev/null
> +++ glibc/stdio-common/tst-printf-format-as-c.c
> @@ -0,0 +1,20 @@
> +/* Test for formatted 'asprintf' 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-as.h"
> +#include "tst-printf-format-skeleton-c.c"
Ok.
> Index: glibc/stdio-common/tst-printf-format-as-char.c
> ===================================================================
> --- /dev/null
> +++ glibc/stdio-common/tst-printf-format-as-char.c
> @@ -0,0 +1,20 @@
> +/* Test for formatted 'asprintf' 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-as.h"
> +#include "tst-printf-format-skeleton-char.c"
Ok.
> Index: glibc/stdio-common/tst-printf-format-as-double.c
> ===================================================================
> --- /dev/null
> +++ glibc/stdio-common/tst-printf-format-as-double.c
> @@ -0,0 +1,22 @@
> +/* Test for formatted 'asprintf' 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/>. */
> +
> +#define TIMEOUT (DEFAULT_TIMEOUT * 32)
> +
> +#include "tst-printf-format-as.h"
> +#include "tst-printf-format-skeleton-double.c"
Ok.
> Index: glibc/stdio-common/tst-printf-format-as-int.c
> ===================================================================
> --- /dev/null
> +++ glibc/stdio-common/tst-printf-format-as-int.c
> @@ -0,0 +1,20 @@
> +/* Test for formatted 'asprintf' 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-as.h"
> +#include "tst-printf-format-skeleton-int.c"
Ok.
> Index: glibc/stdio-common/tst-printf-format-as-ldouble.c
> ===================================================================
> --- /dev/null
> +++ glibc/stdio-common/tst-printf-format-as-ldouble.c
> @@ -0,0 +1,22 @@
> +/* Test for formatted 'asprintf' 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/>. */
> +
> +#define TIMEOUT (DEFAULT_TIMEOUT * 128)
> +
> +#include "tst-printf-format-as.h"
> +#include "tst-printf-format-skeleton-ldouble.c"
Ok.
> Index: glibc/stdio-common/tst-printf-format-as-llong.c
> ===================================================================
> --- /dev/null
> +++ glibc/stdio-common/tst-printf-format-as-llong.c
> @@ -0,0 +1,20 @@
> +/* Test for formatted 'asprintf' 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-as.h"
> +#include "tst-printf-format-skeleton-llong.c"
Ok.
> Index: glibc/stdio-common/tst-printf-format-as-long.c
> ===================================================================
> --- /dev/null
> +++ glibc/stdio-common/tst-printf-format-as-long.c
> @@ -0,0 +1,20 @@
> +/* Test for formatted 'asprintf' 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-as.h"
> +#include "tst-printf-format-skeleton-long.c"
Ok.
> Index: glibc/stdio-common/tst-printf-format-as-s.c
> ===================================================================
> --- /dev/null
> +++ glibc/stdio-common/tst-printf-format-as-s.c
> @@ -0,0 +1,20 @@
> +/* Test for formatted 'asprintf' 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-as.h"
> +#include "tst-printf-format-skeleton-s.c"
Ok.
> Index: glibc/stdio-common/tst-printf-format-as-short.c
> ===================================================================
> --- /dev/null
> +++ glibc/stdio-common/tst-printf-format-as-short.c
> @@ -0,0 +1,20 @@
> +/* Test for formatted 'asprintf' 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-as.h"
> +#include "tst-printf-format-skeleton-short.c"
Ok.
> Index: glibc/stdio-common/tst-printf-format-as-uchar.c
> ===================================================================
> --- /dev/null
> +++ glibc/stdio-common/tst-printf-format-as-uchar.c
> @@ -0,0 +1,20 @@
> +/* Test for formatted 'asprintf' 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-as.h"
> +#include "tst-printf-format-skeleton-uchar.c"
Ok.
> Index: glibc/stdio-common/tst-printf-format-as-uint.c
> ===================================================================
> --- /dev/null
> +++ glibc/stdio-common/tst-printf-format-as-uint.c
> @@ -0,0 +1,20 @@
> +/* Test for formatted 'asprintf' 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-as.h"
> +#include "tst-printf-format-skeleton-uint.c"
Ok.
> Index: glibc/stdio-common/tst-printf-format-as-ullong.c
> ===================================================================
> --- /dev/null
> +++ glibc/stdio-common/tst-printf-format-as-ullong.c
> @@ -0,0 +1,20 @@
> +/* Test for formatted 'asprintf' 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-as.h"
> +#include "tst-printf-format-skeleton-ullong.c"
Ok.
> Index: glibc/stdio-common/tst-printf-format-as-ulong.c
> ===================================================================
> --- /dev/null
> +++ glibc/stdio-common/tst-printf-format-as-ulong.c
> @@ -0,0 +1,20 @@
> +/* Test for formatted 'asprintf' 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-as.h"
> +#include "tst-printf-format-skeleton-ulong.c"
Ok.
> Index: glibc/stdio-common/tst-printf-format-as-ushort.c
> ===================================================================
> --- /dev/null
> +++ glibc/stdio-common/tst-printf-format-as-ushort.c
> @@ -0,0 +1,20 @@
> +/* Test for formatted 'asprintf' 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-as.h"
> +#include "tst-printf-format-skeleton-ushort.c"
Ok.
> Index: glibc/stdio-common/tst-printf-format-as.h
> ===================================================================
> --- /dev/null
> +++ glibc/stdio-common/tst-printf-format-as.h
> @@ -0,0 +1,46 @@
> +/* Test feature wrapper for formatted 'asprintf' 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 <stdio.h>
> +#include <stdlib.h>
> +
> +#define printf_under_test(...) \
> +({ \
> + __label__ out; \
> + int result; \
> + char *str; \
> + \
> + result = asprintf (&str, __VA_ARGS__); \
> + if (result < 0) \
> + { \
> + perror ("asprintf"); \
> + goto out; \
> + } \
> + if (fwrite (str, sizeof (*str), result, stdout) != result) \
> + { \
> + perror ("fwrite"); \
> + result = -1; \
> + } \
> + free (str); \
> +out: \
> + result; \
> +})
> +
> +#ifndef TIMEOUT
> +# define TIMEOUT (DEFAULT_TIMEOUT * 12)
> +#endif
Ok.
More information about the Libc-alpha
mailing list