diff mbox series

[v4,04/12] stdio-common: Add tests for formatted fprintf output specifiers

Message ID alpine.DEB.2.21.2410311931480.40463@angie.orcam.me.uk
State New
Headers show
Series stdio-common: Add tests for formatted printf output specifiers | expand

Commit Message

Maciej W. Rozycki Oct. 31, 2024, 7:55 p.m. UTC 
From: Maciej W. Rozycki <macro@redhat.com>

Wire fprintf into test infrastructure for formatted printf output
specifiers.
---
No change from v3.

New change in v3.
---
 stdio-common/Makefile                      |    2 +-
 stdio-common/tst-printf-format-f-c.c       |   20 ++++++++++++++++++++
 stdio-common/tst-printf-format-f-char.c    |   20 ++++++++++++++++++++
 stdio-common/tst-printf-format-f-double.c  |   20 ++++++++++++++++++++
 stdio-common/tst-printf-format-f-int.c     |   20 ++++++++++++++++++++
 stdio-common/tst-printf-format-f-ldouble.c |   20 ++++++++++++++++++++
 stdio-common/tst-printf-format-f-llong.c   |   20 ++++++++++++++++++++
 stdio-common/tst-printf-format-f-long.c    |   20 ++++++++++++++++++++
 stdio-common/tst-printf-format-f-s.c       |   20 ++++++++++++++++++++
 stdio-common/tst-printf-format-f-short.c   |   20 ++++++++++++++++++++
 stdio-common/tst-printf-format-f-uchar.c   |   20 ++++++++++++++++++++
 stdio-common/tst-printf-format-f-uint.c    |   20 ++++++++++++++++++++
 stdio-common/tst-printf-format-f-ullong.c  |   20 ++++++++++++++++++++
 stdio-common/tst-printf-format-f-ulong.c   |   20 ++++++++++++++++++++
 stdio-common/tst-printf-format-f-ushort.c  |   20 ++++++++++++++++++++
 stdio-common/tst-printf-format-f.h         |   29 +++++++++++++++++++++++++++++
 16 files changed, 310 insertions(+), 1 deletion(-)

glibc-tst-printf-format-all-fprintf.diff
diff mbox series

Patch

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 as d
+xprintf-funcs := p as d f
 
 # List of data types and formats for individual per-conversion printf tests.
 fmt-convs := double ldouble
Index: glibc/stdio-common/tst-printf-format-f-c.c
===================================================================
--- /dev/null
+++ glibc/stdio-common/tst-printf-format-f-c.c
@@ -0,0 +1,20 @@ 
+/* Test for formatted 'fprintf' 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-f.h"
+#include "tst-printf-format-skeleton-c.c"
Index: glibc/stdio-common/tst-printf-format-f-char.c
===================================================================
--- /dev/null
+++ glibc/stdio-common/tst-printf-format-f-char.c
@@ -0,0 +1,20 @@ 
+/* Test for formatted 'fprintf' 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-f.h"
+#include "tst-printf-format-skeleton-char.c"
Index: glibc/stdio-common/tst-printf-format-f-double.c
===================================================================
--- /dev/null
+++ glibc/stdio-common/tst-printf-format-f-double.c
@@ -0,0 +1,20 @@ 
+/* Test for formatted 'fprintf' 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/>.  */
+
+#include "tst-printf-format-f.h"
+#include "tst-printf-format-skeleton-double.c"
Index: glibc/stdio-common/tst-printf-format-f-int.c
===================================================================
--- /dev/null
+++ glibc/stdio-common/tst-printf-format-f-int.c
@@ -0,0 +1,20 @@ 
+/* Test for formatted 'fprintf' 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-f.h"
+#include "tst-printf-format-skeleton-int.c"
Index: glibc/stdio-common/tst-printf-format-f-ldouble.c
===================================================================
--- /dev/null
+++ glibc/stdio-common/tst-printf-format-f-ldouble.c
@@ -0,0 +1,20 @@ 
+/* Test for formatted 'fprintf' 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/>.  */
+
+#include "tst-printf-format-f.h"
+#include "tst-printf-format-skeleton-ldouble.c"
Index: glibc/stdio-common/tst-printf-format-f-llong.c
===================================================================
--- /dev/null
+++ glibc/stdio-common/tst-printf-format-f-llong.c
@@ -0,0 +1,20 @@ 
+/* Test for formatted 'fprintf' 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-f.h"
+#include "tst-printf-format-skeleton-llong.c"
Index: glibc/stdio-common/tst-printf-format-f-long.c
===================================================================
--- /dev/null
+++ glibc/stdio-common/tst-printf-format-f-long.c
@@ -0,0 +1,20 @@ 
+/* Test for formatted 'fprintf' 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-f.h"
+#include "tst-printf-format-skeleton-long.c"
Index: glibc/stdio-common/tst-printf-format-f-s.c
===================================================================
--- /dev/null
+++ glibc/stdio-common/tst-printf-format-f-s.c
@@ -0,0 +1,20 @@ 
+/* Test for formatted 'fprintf' 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-f.h"
+#include "tst-printf-format-skeleton-s.c"
Index: glibc/stdio-common/tst-printf-format-f-short.c
===================================================================
--- /dev/null
+++ glibc/stdio-common/tst-printf-format-f-short.c
@@ -0,0 +1,20 @@ 
+/* Test for formatted 'fprintf' 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-f.h"
+#include "tst-printf-format-skeleton-short.c"
Index: glibc/stdio-common/tst-printf-format-f-uchar.c
===================================================================
--- /dev/null
+++ glibc/stdio-common/tst-printf-format-f-uchar.c
@@ -0,0 +1,20 @@ 
+/* Test for formatted 'fprintf' 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-f.h"
+#include "tst-printf-format-skeleton-uchar.c"
Index: glibc/stdio-common/tst-printf-format-f-uint.c
===================================================================
--- /dev/null
+++ glibc/stdio-common/tst-printf-format-f-uint.c
@@ -0,0 +1,20 @@ 
+/* Test for formatted 'fprintf' 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-f.h"
+#include "tst-printf-format-skeleton-uint.c"
Index: glibc/stdio-common/tst-printf-format-f-ullong.c
===================================================================
--- /dev/null
+++ glibc/stdio-common/tst-printf-format-f-ullong.c
@@ -0,0 +1,20 @@ 
+/* Test for formatted 'fprintf' 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-f.h"
+#include "tst-printf-format-skeleton-ullong.c"
Index: glibc/stdio-common/tst-printf-format-f-ulong.c
===================================================================
--- /dev/null
+++ glibc/stdio-common/tst-printf-format-f-ulong.c
@@ -0,0 +1,20 @@ 
+/* Test for formatted 'fprintf' 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-f.h"
+#include "tst-printf-format-skeleton-ulong.c"
Index: glibc/stdio-common/tst-printf-format-f-ushort.c
===================================================================
--- /dev/null
+++ glibc/stdio-common/tst-printf-format-f-ushort.c
@@ -0,0 +1,20 @@ 
+/* Test for formatted 'fprintf' 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-f.h"
+#include "tst-printf-format-skeleton-ushort.c"
Index: glibc/stdio-common/tst-printf-format-f.h
===================================================================
--- /dev/null
+++ glibc/stdio-common/tst-printf-format-f.h
@@ -0,0 +1,29 @@ 
+/* Test feature wrapper for formatted 'fprintf' 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>
+
+#define printf_under_test(...)						\
+({									\
+  int result;								\
+									\
+  result = fprintf (stdout, __VA_ARGS__);				\
+  if (result < 0)							\
+    perror ("fprintf");							\
+  result;								\
+})