commit 53ee7ede430b92fcefd31fc00bfd3fa9acec5846 Author: Maciej W. Rozycki Date: Fri Mar 28 12:35:53 2025 +0000 stdio-common: Add tests for formatted vfscanf input specifiers Wire vfscanf into test infrastructure for formatted scanf input specifiers. Reviewed-by: Joseph Myers diff --git a/stdio-common/Makefile b/stdio-common/Makefile index 3a09b5bfbc930b45..13c50f07ccfc86c3 100644 --- a/stdio-common/Makefile +++ b/stdio-common/Makefile @@ -52,7 +52,7 @@ nonfmt-xprintf-stems := \ xprintf-stems := $(sort $(fmt-xprintf-stems) $(nonfmt-xprintf-stems)) # 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. # Further conversions are provided by sysdeps. diff --git a/stdio-common/tst-scanf-format-vf-c.c b/stdio-common/tst-scanf-format-vf-c.c new file mode 100644 index 0000000000000000..307bfe82c3875245 --- /dev/null +++ b/stdio-common/tst-scanf-format-vf-c.c @@ -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 + . */ + +#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" diff --git a/stdio-common/tst-scanf-format-vf-char.c b/stdio-common/tst-scanf-format-vf-char.c new file mode 100644 index 0000000000000000..602899b2bcd5b7eb --- /dev/null +++ b/stdio-common/tst-scanf-format-vf-char.c @@ -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 + . */ + +#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" diff --git a/stdio-common/tst-scanf-format-vf-double.c b/stdio-common/tst-scanf-format-vf-double.c new file mode 100644 index 0000000000000000..8b58bbe10b3e8622 --- /dev/null +++ b/stdio-common/tst-scanf-format-vf-double.c @@ -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 + . */ + +#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" diff --git a/stdio-common/tst-scanf-format-vf-float.c b/stdio-common/tst-scanf-format-vf-float.c new file mode 100644 index 0000000000000000..81dad06ebe389438 --- /dev/null +++ b/stdio-common/tst-scanf-format-vf-float.c @@ -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 + . */ + +#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" diff --git a/stdio-common/tst-scanf-format-vf-int.c b/stdio-common/tst-scanf-format-vf-int.c new file mode 100644 index 0000000000000000..8038791f1411d579 --- /dev/null +++ b/stdio-common/tst-scanf-format-vf-int.c @@ -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 + . */ + +#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" diff --git a/stdio-common/tst-scanf-format-vf-ldouble.c b/stdio-common/tst-scanf-format-vf-ldouble.c new file mode 100644 index 0000000000000000..ec9a7c4632968966 --- /dev/null +++ b/stdio-common/tst-scanf-format-vf-ldouble.c @@ -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 + . */ + +#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" diff --git a/stdio-common/tst-scanf-format-vf-llong.c b/stdio-common/tst-scanf-format-vf-llong.c new file mode 100644 index 0000000000000000..adc4b125de23cd3c --- /dev/null +++ b/stdio-common/tst-scanf-format-vf-llong.c @@ -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 + . */ + +#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" diff --git a/stdio-common/tst-scanf-format-vf-long.c b/stdio-common/tst-scanf-format-vf-long.c new file mode 100644 index 0000000000000000..5f26d6c9ce69e08f --- /dev/null +++ b/stdio-common/tst-scanf-format-vf-long.c @@ -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 + . */ + +#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" diff --git a/stdio-common/tst-scanf-format-vf-short.c b/stdio-common/tst-scanf-format-vf-short.c new file mode 100644 index 0000000000000000..0e081ead780b6882 --- /dev/null +++ b/stdio-common/tst-scanf-format-vf-short.c @@ -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 + . */ + +#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" diff --git a/stdio-common/tst-scanf-format-vf-uchar.c b/stdio-common/tst-scanf-format-vf-uchar.c new file mode 100644 index 0000000000000000..2e879f52ce705646 --- /dev/null +++ b/stdio-common/tst-scanf-format-vf-uchar.c @@ -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 + . */ + +#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" diff --git a/stdio-common/tst-scanf-format-vf-uint.c b/stdio-common/tst-scanf-format-vf-uint.c new file mode 100644 index 0000000000000000..4874f86ef21cf5fe --- /dev/null +++ b/stdio-common/tst-scanf-format-vf-uint.c @@ -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 + . */ + +#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" diff --git a/stdio-common/tst-scanf-format-vf-ullong.c b/stdio-common/tst-scanf-format-vf-ullong.c new file mode 100644 index 0000000000000000..dde09018c46128a5 --- /dev/null +++ b/stdio-common/tst-scanf-format-vf-ullong.c @@ -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 + . */ + +#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" diff --git a/stdio-common/tst-scanf-format-vf-ulong.c b/stdio-common/tst-scanf-format-vf-ulong.c new file mode 100644 index 0000000000000000..81023061ef66f824 --- /dev/null +++ b/stdio-common/tst-scanf-format-vf-ulong.c @@ -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 + . */ + +#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" diff --git a/stdio-common/tst-scanf-format-vf-ushort.c b/stdio-common/tst-scanf-format-vf-ushort.c new file mode 100644 index 0000000000000000..cb8eb4bdcf5e3abc --- /dev/null +++ b/stdio-common/tst-scanf-format-vf-ushort.c @@ -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 + . */ + +#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" diff --git a/stdio-common/tst-scanf-format-vf.h b/stdio-common/tst-scanf-format-vf.h new file mode 100644 index 0000000000000000..6037e63921aa4ba3 --- /dev/null +++ b/stdio-common/tst-scanf-format-vf.h @@ -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 + . */ + +#include +#include + +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; +}