commit 50576060c8bf88a3c64c9ab1cdd516974ffb2690 Author: Maciej W. Rozycki Date: Fri Mar 28 12:35:52 2025 +0000 stdio-common: Add tests for formatted fscanf input specifiers Wire fscanf into test infrastructure for formatted scanf input specifiers. Reviewed-by: Joseph Myers diff --git a/stdio-common/Makefile b/stdio-common/Makefile index 15525a0f768244c6..74d5e02c7206cabc 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 +xscanf-funcs := s f # 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-f-c.c b/stdio-common/tst-scanf-format-f-c.c new file mode 100644 index 0000000000000000..75ce3cd7c314faee --- /dev/null +++ b/stdio-common/tst-scanf-format-f-c.c @@ -0,0 +1,22 @@ +/* Test for formatted 'fscanf' 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-f.h" +#include "tst-scanf-format-character.h" +#include "tst-scanf-format-skeleton-c.c" diff --git a/stdio-common/tst-scanf-format-f-char.c b/stdio-common/tst-scanf-format-f-char.c new file mode 100644 index 0000000000000000..ee5fbe9e1fc9c0aa --- /dev/null +++ b/stdio-common/tst-scanf-format-f-char.c @@ -0,0 +1,22 @@ +/* Test for formatted 'fscanf' 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-f.h" +#include "tst-scanf-format-integer.h" +#include "tst-scanf-format-skeleton-char.c" diff --git a/stdio-common/tst-scanf-format-f-double.c b/stdio-common/tst-scanf-format-f-double.c new file mode 100644 index 0000000000000000..1fb25b56b2d27ce5 --- /dev/null +++ b/stdio-common/tst-scanf-format-f-double.c @@ -0,0 +1,22 @@ +/* Test for formatted 'fscanf' 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-f.h" +#include "tst-scanf-format-real.h" +#include "tst-scanf-format-skeleton-double.c" diff --git a/stdio-common/tst-scanf-format-f-float.c b/stdio-common/tst-scanf-format-f-float.c new file mode 100644 index 0000000000000000..b5a6ae4b1e957bd3 --- /dev/null +++ b/stdio-common/tst-scanf-format-f-float.c @@ -0,0 +1,22 @@ +/* Test for formatted 'fscanf' 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-f.h" +#include "tst-scanf-format-real.h" +#include "tst-scanf-format-skeleton-float.c" diff --git a/stdio-common/tst-scanf-format-f-int.c b/stdio-common/tst-scanf-format-f-int.c new file mode 100644 index 0000000000000000..961d66bfa0a842b8 --- /dev/null +++ b/stdio-common/tst-scanf-format-f-int.c @@ -0,0 +1,22 @@ +/* Test for formatted 'fscanf' 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-f.h" +#include "tst-scanf-format-integer.h" +#include "tst-scanf-format-skeleton-int.c" diff --git a/stdio-common/tst-scanf-format-f-ldouble.c b/stdio-common/tst-scanf-format-f-ldouble.c new file mode 100644 index 0000000000000000..6198d35041584402 --- /dev/null +++ b/stdio-common/tst-scanf-format-f-ldouble.c @@ -0,0 +1,22 @@ +/* Test for formatted 'fscanf' 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-f.h" +#include "tst-scanf-format-real.h" +#include "tst-scanf-format-skeleton-ldouble.c" diff --git a/stdio-common/tst-scanf-format-f-llong.c b/stdio-common/tst-scanf-format-f-llong.c new file mode 100644 index 0000000000000000..1af672f9c2e1484c --- /dev/null +++ b/stdio-common/tst-scanf-format-f-llong.c @@ -0,0 +1,22 @@ +/* Test for formatted 'fscanf' 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-f.h" +#include "tst-scanf-format-integer.h" +#include "tst-scanf-format-skeleton-llong.c" diff --git a/stdio-common/tst-scanf-format-f-long.c b/stdio-common/tst-scanf-format-f-long.c new file mode 100644 index 0000000000000000..fc908111d973ddfa --- /dev/null +++ b/stdio-common/tst-scanf-format-f-long.c @@ -0,0 +1,22 @@ +/* Test for formatted 'fscanf' 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-f.h" +#include "tst-scanf-format-integer.h" +#include "tst-scanf-format-skeleton-long.c" diff --git a/stdio-common/tst-scanf-format-f-short.c b/stdio-common/tst-scanf-format-f-short.c new file mode 100644 index 0000000000000000..61697e25987f6281 --- /dev/null +++ b/stdio-common/tst-scanf-format-f-short.c @@ -0,0 +1,22 @@ +/* Test for formatted 'fscanf' 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-f.h" +#include "tst-scanf-format-integer.h" +#include "tst-scanf-format-skeleton-short.c" diff --git a/stdio-common/tst-scanf-format-f-uchar.c b/stdio-common/tst-scanf-format-f-uchar.c new file mode 100644 index 0000000000000000..b4b8af38e6124c77 --- /dev/null +++ b/stdio-common/tst-scanf-format-f-uchar.c @@ -0,0 +1,22 @@ +/* Test for formatted 'fscanf' 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-f.h" +#include "tst-scanf-format-integer.h" +#include "tst-scanf-format-skeleton-uchar.c" diff --git a/stdio-common/tst-scanf-format-f-uint.c b/stdio-common/tst-scanf-format-f-uint.c new file mode 100644 index 0000000000000000..af226b0d1044cc8b --- /dev/null +++ b/stdio-common/tst-scanf-format-f-uint.c @@ -0,0 +1,22 @@ +/* Test for formatted 'fscanf' 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-f.h" +#include "tst-scanf-format-integer.h" +#include "tst-scanf-format-skeleton-uint.c" diff --git a/stdio-common/tst-scanf-format-f-ullong.c b/stdio-common/tst-scanf-format-f-ullong.c new file mode 100644 index 0000000000000000..50ea8123bbe52c60 --- /dev/null +++ b/stdio-common/tst-scanf-format-f-ullong.c @@ -0,0 +1,22 @@ +/* Test for formatted 'fscanf' 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-f.h" +#include "tst-scanf-format-integer.h" +#include "tst-scanf-format-skeleton-ullong.c" diff --git a/stdio-common/tst-scanf-format-f-ulong.c b/stdio-common/tst-scanf-format-f-ulong.c new file mode 100644 index 0000000000000000..673e7703264756dd --- /dev/null +++ b/stdio-common/tst-scanf-format-f-ulong.c @@ -0,0 +1,22 @@ +/* Test for formatted 'fscanf' 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-f.h" +#include "tst-scanf-format-integer.h" +#include "tst-scanf-format-skeleton-ulong.c" diff --git a/stdio-common/tst-scanf-format-f-ushort.c b/stdio-common/tst-scanf-format-f-ushort.c new file mode 100644 index 0000000000000000..413ba670e9782984 --- /dev/null +++ b/stdio-common/tst-scanf-format-f-ushort.c @@ -0,0 +1,22 @@ +/* Test for formatted 'fscanf' 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-f.h" +#include "tst-scanf-format-integer.h" +#include "tst-scanf-format-skeleton-ushort.c" diff --git a/stdio-common/tst-scanf-format-f.h b/stdio-common/tst-scanf-format-f.h new file mode 100644 index 0000000000000000..9a4caeeb16f87801 --- /dev/null +++ b/stdio-common/tst-scanf-format-f.h @@ -0,0 +1,29 @@ +/* Test feature wrapper for formatted 'fscanf' 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 + +#define scanf_under_test(...) \ +({ \ + int result = fscanf (stdin, __VA_ARGS__); \ + if (ferror (stdin)) \ + result = INPUT_ERROR; \ + else if (result == EOF) \ + result = INPUT_EOF; \ + result; \ +})