qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

stdio-common: Add tests for formatted vfscanf input specifiers 

Wire vfscanf into test infrastructure for formatted scanf input
specifiers.

Reviewed-by: Joseph Myers <josmyers@redhat.com>
This commit is contained in:
Maciej W. Rozycki 2025-03-28 12:35:53 +00:00
parent 63c81fa0db
commit 53ee7ede43
16 changed files with 345 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
stdio-common/Makefile
View File

@ -52,7 +52,7 @@ nonfmt-xprintf-stems := \
xprintf-stems := $(sort $(fmt-xprintf-stems) $(nonfmt-xprintf-stems)) xprintf-stems := $(sort $(fmt-xprintf-stems) $(nonfmt-xprintf-stems))
# List of markers for scanf family function tests. # List of markers for scanf family function tests.
xscanf-funcs := s f ss v xscanf-funcs := s f ss v vf
# List of data types and formats for individual per-conversion scanf tests. # List of data types and formats for individual per-conversion scanf tests.
# Further conversions are provided by sysdeps. # Further conversions are provided by sysdeps.

22
stdio-common/tst-scanf-format-vf-c.c Normal file
View File

@ -0,0 +1,22 @@
/* Test for formatted 'vfscanf' input for the character conversions.
Copyright (C) 2025 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-scanf-format-skeleton.h"
#include "tst-scanf-format-vf.h"
#include "tst-scanf-format-character.h"
#include "tst-scanf-format-skeleton-c.c"

22
stdio-common/tst-scanf-format-vf-char.c Normal file
View File

@ -0,0 +1,22 @@
/* Test for formatted 'vfscanf' input for signed char conversions.
Copyright (C) 2025 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-scanf-format-skeleton.h"
#include "tst-scanf-format-vf.h"
#include "tst-scanf-format-integer.h"
#include "tst-scanf-format-skeleton-char.c"

22
stdio-common/tst-scanf-format-vf-double.c Normal file
View File

@ -0,0 +1,22 @@
/* Test for formatted 'vfscanf' input for double conversions.
Copyright (C) 2025 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-scanf-format-skeleton.h"
#include "tst-scanf-format-vf.h"
#include "tst-scanf-format-real.h"
#include "tst-scanf-format-skeleton-double.c"

22
stdio-common/tst-scanf-format-vf-float.c Normal file
View File

@ -0,0 +1,22 @@
/* Test for formatted 'vfscanf' input for float conversions.
Copyright (C) 2025 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-scanf-format-skeleton.h"
#include "tst-scanf-format-vf.h"
#include "tst-scanf-format-real.h"
#include "tst-scanf-format-skeleton-float.c"

22
stdio-common/tst-scanf-format-vf-int.c Normal file
View File

@ -0,0 +1,22 @@
/* Test for formatted 'vfscanf' input for int conversions.
Copyright (C) 2025 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-scanf-format-skeleton.h"
#include "tst-scanf-format-vf.h"
#include "tst-scanf-format-integer.h"
#include "tst-scanf-format-skeleton-int.c"

22
stdio-common/tst-scanf-format-vf-ldouble.c Normal file
View File

@ -0,0 +1,22 @@
/* Test for formatted 'vfscanf' input for long double conversions.
Copyright (C) 2025 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-scanf-format-skeleton.h"
#include "tst-scanf-format-vf.h"
#include "tst-scanf-format-real.h"
#include "tst-scanf-format-skeleton-ldouble.c"

22
stdio-common/tst-scanf-format-vf-llong.c Normal file
View File

@ -0,0 +1,22 @@
/* Test for formatted 'vfscanf' input for long long conversions.
Copyright (C) 2025 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-scanf-format-skeleton.h"
#include "tst-scanf-format-vf.h"
#include "tst-scanf-format-integer.h"
#include "tst-scanf-format-skeleton-llong.c"

22
stdio-common/tst-scanf-format-vf-long.c Normal file
View File

@ -0,0 +1,22 @@
/* Test for formatted 'vfscanf' input for long conversions.
Copyright (C) 2025 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-scanf-format-skeleton.h"
#include "tst-scanf-format-vf.h"
#include "tst-scanf-format-integer.h"
#include "tst-scanf-format-skeleton-long.c"

22
stdio-common/tst-scanf-format-vf-short.c Normal file
View File

@ -0,0 +1,22 @@
/* Test for formatted 'vfscanf' input for short int conversions.
Copyright (C) 2025 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-scanf-format-skeleton.h"
#include "tst-scanf-format-vf.h"
#include "tst-scanf-format-integer.h"
#include "tst-scanf-format-skeleton-short.c"

22
stdio-common/tst-scanf-format-vf-uchar.c Normal file
View File

@ -0,0 +1,22 @@
/* Test for formatted 'vfscanf' input for unsigned char conversions.
Copyright (C) 2025 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-scanf-format-skeleton.h"
#include "tst-scanf-format-vf.h"
#include "tst-scanf-format-integer.h"
#include "tst-scanf-format-skeleton-uchar.c"

22
stdio-common/tst-scanf-format-vf-uint.c Normal file
View File

@ -0,0 +1,22 @@
/* Test for formatted 'vfscanf' input for unsigned int conversions.
Copyright (C) 2025 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-scanf-format-skeleton.h"
#include "tst-scanf-format-vf.h"
#include "tst-scanf-format-integer.h"
#include "tst-scanf-format-skeleton-uint.c"

22
stdio-common/tst-scanf-format-vf-ullong.c Normal file
View File

@ -0,0 +1,22 @@
/* Test for formatted 'vfscanf' input for unsigned long long int conversions.
Copyright (C) 2025 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-scanf-format-skeleton.h"
#include "tst-scanf-format-vf.h"
#include "tst-scanf-format-integer.h"
#include "tst-scanf-format-skeleton-ullong.c"

22
stdio-common/tst-scanf-format-vf-ulong.c Normal file
View File

@ -0,0 +1,22 @@
/* Test for formatted 'vfscanf' input for unsigned long int conversions.
Copyright (C) 2025 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-scanf-format-skeleton.h"
#include "tst-scanf-format-vf.h"
#include "tst-scanf-format-integer.h"
#include "tst-scanf-format-skeleton-ulong.c"

22
stdio-common/tst-scanf-format-vf-ushort.c Normal file
View File

@ -0,0 +1,22 @@
/* Test for formatted 'vfscanf' input for unsigned short int conversions.
Copyright (C) 2025 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-scanf-format-skeleton.h"
#include "tst-scanf-format-vf.h"
#include "tst-scanf-format-integer.h"
#include "tst-scanf-format-skeleton-ushort.c"

36
stdio-common/tst-scanf-format-vf.h Normal file
View File

@ -0,0 +1,36 @@
/* Test feature wrapper for formatted 'vfscanf' input.
Copyright (C) 2025 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>
static int
scanf_under_test (const char *restrict fmt, ...)
{
va_list ap;
int result;
va_start (ap, fmt);
result = vfscanf (stdin, fmt, ap);
va_end (ap);
if (ferror (stdin))
result = INPUT_ERROR;
else if (result == EOF)
result = INPUT_EOF;
return result;
}