mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-23 01:33:36 +08:00
stdio-common: Add tests for formatted vasprintf output specifiers
Wire vasprintf into test infrastructure for formatted printf output specifiers. Owing to mtrace logging these tests take amounts of time to complete similar to those of corresponding asprintf tests, so set timeouts for the tests accordingly, with a global default for all the vasprintf tests, and then individual higher settings for double and long double tests each. Reviewed-by: DJ Delorie <dj@redhat.com>
This commit is contained in:
parent
bad554d9b4
commit
349670f809
@ -23,7 +23,7 @@ subdir := stdio-common
|
||||
include ../Makeconfig
|
||||
|
||||
# List of markers for printf family function tests.
|
||||
xprintf-funcs := p as d f s sn v
|
||||
xprintf-funcs := p as d f s sn v vas
|
||||
|
||||
# List of data types and formats for individual per-conversion printf tests.
|
||||
fmt-convs := double ldouble
|
||||
|
20
stdio-common/tst-printf-format-vas-c.c
Normal file
20
stdio-common/tst-printf-format-vas-c.c
Normal file
@ -0,0 +1,20 @@
|
||||
/* Test for formatted 'vasprintf' 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-vas.h"
|
||||
#include "tst-printf-format-skeleton-c.c"
|
20
stdio-common/tst-printf-format-vas-char.c
Normal file
20
stdio-common/tst-printf-format-vas-char.c
Normal file
@ -0,0 +1,20 @@
|
||||
/* Test for formatted 'vasprintf' 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-vas.h"
|
||||
#include "tst-printf-format-skeleton-char.c"
|
22
stdio-common/tst-printf-format-vas-double.c
Normal file
22
stdio-common/tst-printf-format-vas-double.c
Normal file
@ -0,0 +1,22 @@
|
||||
/* Test for formatted 'vasprintf' 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-vas.h"
|
||||
#include "tst-printf-format-skeleton-double.c"
|
20
stdio-common/tst-printf-format-vas-int.c
Normal file
20
stdio-common/tst-printf-format-vas-int.c
Normal file
@ -0,0 +1,20 @@
|
||||
/* Test for formatted 'vasprintf' 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-vas.h"
|
||||
#include "tst-printf-format-skeleton-int.c"
|
22
stdio-common/tst-printf-format-vas-ldouble.c
Normal file
22
stdio-common/tst-printf-format-vas-ldouble.c
Normal file
@ -0,0 +1,22 @@
|
||||
/* Test for formatted 'vasprintf' 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-vas.h"
|
||||
#include "tst-printf-format-skeleton-ldouble.c"
|
20
stdio-common/tst-printf-format-vas-llong.c
Normal file
20
stdio-common/tst-printf-format-vas-llong.c
Normal file
@ -0,0 +1,20 @@
|
||||
/* Test for formatted 'vasprintf' 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-vas.h"
|
||||
#include "tst-printf-format-skeleton-llong.c"
|
20
stdio-common/tst-printf-format-vas-long.c
Normal file
20
stdio-common/tst-printf-format-vas-long.c
Normal file
@ -0,0 +1,20 @@
|
||||
/* Test for formatted 'vasprintf' 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-vas.h"
|
||||
#include "tst-printf-format-skeleton-long.c"
|
20
stdio-common/tst-printf-format-vas-s.c
Normal file
20
stdio-common/tst-printf-format-vas-s.c
Normal file
@ -0,0 +1,20 @@
|
||||
/* Test for formatted 'vasprintf' 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-vas.h"
|
||||
#include "tst-printf-format-skeleton-s.c"
|
20
stdio-common/tst-printf-format-vas-short.c
Normal file
20
stdio-common/tst-printf-format-vas-short.c
Normal file
@ -0,0 +1,20 @@
|
||||
/* Test for formatted 'vasprintf' 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-vas.h"
|
||||
#include "tst-printf-format-skeleton-short.c"
|
20
stdio-common/tst-printf-format-vas-uchar.c
Normal file
20
stdio-common/tst-printf-format-vas-uchar.c
Normal file
@ -0,0 +1,20 @@
|
||||
/* Test for formatted 'vasprintf' 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-vas.h"
|
||||
#include "tst-printf-format-skeleton-uchar.c"
|
20
stdio-common/tst-printf-format-vas-uint.c
Normal file
20
stdio-common/tst-printf-format-vas-uint.c
Normal file
@ -0,0 +1,20 @@
|
||||
/* Test for formatted 'vasprintf' 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-vas.h"
|
||||
#include "tst-printf-format-skeleton-uint.c"
|
20
stdio-common/tst-printf-format-vas-ullong.c
Normal file
20
stdio-common/tst-printf-format-vas-ullong.c
Normal file
@ -0,0 +1,20 @@
|
||||
/* Test for formatted 'vasprintf' 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-vas.h"
|
||||
#include "tst-printf-format-skeleton-ullong.c"
|
20
stdio-common/tst-printf-format-vas-ulong.c
Normal file
20
stdio-common/tst-printf-format-vas-ulong.c
Normal file
@ -0,0 +1,20 @@
|
||||
/* Test for formatted 'vasprintf' 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-vas.h"
|
||||
#include "tst-printf-format-skeleton-ulong.c"
|
20
stdio-common/tst-printf-format-vas-ushort.c
Normal file
20
stdio-common/tst-printf-format-vas-ushort.c
Normal file
@ -0,0 +1,20 @@
|
||||
/* Test for formatted 'vasprintf' 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-vas.h"
|
||||
#include "tst-printf-format-skeleton-ushort.c"
|
50
stdio-common/tst-printf-format-vas.h
Normal file
50
stdio-common/tst-printf-format-vas.h
Normal file
@ -0,0 +1,50 @@
|
||||
/* Test feature wrapper for formatted 'vasprintf' 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>
|
||||
|
||||
static int
|
||||
printf_under_test (const char *restrict fmt, ...)
|
||||
{
|
||||
va_list ap;
|
||||
int result;
|
||||
char *str;
|
||||
|
||||
va_start (ap, fmt);
|
||||
result = vasprintf (&str, fmt, ap);
|
||||
va_end (ap);
|
||||
if (result < 0)
|
||||
{
|
||||
perror ("vasprintf");
|
||||
goto out;
|
||||
}
|
||||
if (fwrite (str, sizeof (*str), result, stdout) != result)
|
||||
{
|
||||
perror ("fwrite");
|
||||
result = -1;
|
||||
}
|
||||
free (str);
|
||||
out:
|
||||
return result;
|
||||
}
|
||||
|
||||
#ifndef TIMEOUT
|
||||
# define TIMEOUT (DEFAULT_TIMEOUT * 12)
|
||||
#endif
|
Loading…
Reference in New Issue
Block a user