[v3.1,11/12] stdio-common: Add tests for formatted vsprintf output specifiers

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

Checks

Context Check Description
redhat-pt-bot/TryBot-apply_patch success Patch applied to master at the time it was sent
linaro-tcwg-bot/tcwg_glibc_build--master-arm success Build passed
linaro-tcwg-bot/tcwg_glibc_build--master-aarch64 success Build passed
linaro-tcwg-bot/tcwg_glibc_check--master-arm success Test passed
linaro-tcwg-bot/tcwg_glibc_check--master-aarch64 success Test passed

Commit Message

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

Wire vsprintf into test infrastructure for formatted printf output
specifiers.
---
New change in v3.
---
 stdio-common/Makefile                       |    2 
 stdio-common/tst-printf-format-vs-c.c       |   20 ++++++++
 stdio-common/tst-printf-format-vs-char.c    |   20 ++++++++
 stdio-common/tst-printf-format-vs-double.c  |   20 ++++++++
 stdio-common/tst-printf-format-vs-int.c     |   20 ++++++++
 stdio-common/tst-printf-format-vs-ldouble.c |   20 ++++++++
 stdio-common/tst-printf-format-vs-llong.c   |   20 ++++++++
 stdio-common/tst-printf-format-vs-long.c    |   20 ++++++++
 stdio-common/tst-printf-format-vs-s.c       |   20 ++++++++
 stdio-common/tst-printf-format-vs-short.c   |   20 ++++++++
 stdio-common/tst-printf-format-vs-uchar.c   |   20 ++++++++
 stdio-common/tst-printf-format-vs-uint.c    |   20 ++++++++
 stdio-common/tst-printf-format-vs-ullong.c  |   20 ++++++++
 stdio-common/tst-printf-format-vs-ulong.c   |   20 ++++++++
 stdio-common/tst-printf-format-vs-ushort.c  |   20 ++++++++
 stdio-common/tst-printf-format-vs.h         |   64 ++++++++++++++++++++++++++++
 16 files changed, 345 insertions(+), 1 deletion(-)

glibc-tst-printf-format-all-vsprintf.diff
  

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 f s sn v vas vd vf
+xprintf-funcs := p as d f s sn v vas vd vf vs
 
 # List of data types and formats for individual per-conversion printf tests.
 fmt-convs := double ldouble
Index: glibc/stdio-common/tst-printf-format-vs-c.c
===================================================================
--- /dev/null
+++ glibc/stdio-common/tst-printf-format-vs-c.c
@@ -0,0 +1,20 @@ 
+/* Test for formatted 'vsprintf' 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-vs.h"
+#include "tst-printf-format-skeleton-c.c"
Index: glibc/stdio-common/tst-printf-format-vs-char.c
===================================================================
--- /dev/null
+++ glibc/stdio-common/tst-printf-format-vs-char.c
@@ -0,0 +1,20 @@ 
+/* Test for formatted 'vsprintf' 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-vs.h"
+#include "tst-printf-format-skeleton-char.c"
Index: glibc/stdio-common/tst-printf-format-vs-double.c
===================================================================
--- /dev/null
+++ glibc/stdio-common/tst-printf-format-vs-double.c
@@ -0,0 +1,20 @@ 
+/* Test for formatted 'vsprintf' 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-vs.h"
+#include "tst-printf-format-skeleton-double.c"
Index: glibc/stdio-common/tst-printf-format-vs-int.c
===================================================================
--- /dev/null
+++ glibc/stdio-common/tst-printf-format-vs-int.c
@@ -0,0 +1,20 @@ 
+/* Test for formatted 'vsprintf' 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-vs.h"
+#include "tst-printf-format-skeleton-int.c"
Index: glibc/stdio-common/tst-printf-format-vs-ldouble.c
===================================================================
--- /dev/null
+++ glibc/stdio-common/tst-printf-format-vs-ldouble.c
@@ -0,0 +1,20 @@ 
+/* Test for formatted 'vsprintf' 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-vs.h"
+#include "tst-printf-format-skeleton-ldouble.c"
Index: glibc/stdio-common/tst-printf-format-vs-llong.c
===================================================================
--- /dev/null
+++ glibc/stdio-common/tst-printf-format-vs-llong.c
@@ -0,0 +1,20 @@ 
+/* Test for formatted 'vsprintf' 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-vs.h"
+#include "tst-printf-format-skeleton-llong.c"
Index: glibc/stdio-common/tst-printf-format-vs-long.c
===================================================================
--- /dev/null
+++ glibc/stdio-common/tst-printf-format-vs-long.c
@@ -0,0 +1,20 @@ 
+/* Test for formatted 'vsprintf' 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-vs.h"
+#include "tst-printf-format-skeleton-long.c"
Index: glibc/stdio-common/tst-printf-format-vs-s.c
===================================================================
--- /dev/null
+++ glibc/stdio-common/tst-printf-format-vs-s.c
@@ -0,0 +1,20 @@ 
+/* Test for formatted 'vsprintf' 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-vs.h"
+#include "tst-printf-format-skeleton-s.c"
Index: glibc/stdio-common/tst-printf-format-vs-short.c
===================================================================
--- /dev/null
+++ glibc/stdio-common/tst-printf-format-vs-short.c
@@ -0,0 +1,20 @@ 
+/* Test for formatted 'vsprintf' 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-vs.h"
+#include "tst-printf-format-skeleton-short.c"
Index: glibc/stdio-common/tst-printf-format-vs-uchar.c
===================================================================
--- /dev/null
+++ glibc/stdio-common/tst-printf-format-vs-uchar.c
@@ -0,0 +1,20 @@ 
+/* Test for formatted 'vsprintf' 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-vs.h"
+#include "tst-printf-format-skeleton-uchar.c"
Index: glibc/stdio-common/tst-printf-format-vs-uint.c
===================================================================
--- /dev/null
+++ glibc/stdio-common/tst-printf-format-vs-uint.c
@@ -0,0 +1,20 @@ 
+/* Test for formatted 'vsprintf' 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-vs.h"
+#include "tst-printf-format-skeleton-uint.c"
Index: glibc/stdio-common/tst-printf-format-vs-ullong.c
===================================================================
--- /dev/null
+++ glibc/stdio-common/tst-printf-format-vs-ullong.c
@@ -0,0 +1,20 @@ 
+/* Test for formatted 'vsprintf' 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-vs.h"
+#include "tst-printf-format-skeleton-ullong.c"
Index: glibc/stdio-common/tst-printf-format-vs-ulong.c
===================================================================
--- /dev/null
+++ glibc/stdio-common/tst-printf-format-vs-ulong.c
@@ -0,0 +1,20 @@ 
+/* Test for formatted 'vsprintf' 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-vs.h"
+#include "tst-printf-format-skeleton-ulong.c"
Index: glibc/stdio-common/tst-printf-format-vs-ushort.c
===================================================================
--- /dev/null
+++ glibc/stdio-common/tst-printf-format-vs-ushort.c
@@ -0,0 +1,20 @@ 
+/* Test for formatted 'vsprintf' 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-vs.h"
+#include "tst-printf-format-skeleton-ushort.c"
Index: glibc/stdio-common/tst-printf-format-vs.h
===================================================================
--- /dev/null
+++ glibc/stdio-common/tst-printf-format-vs.h
@@ -0,0 +1,64 @@ 
+/* Test feature wrapper for formatted 'vsprintf' 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>
+
+#include <support/next_to_fault.h>
+
+#define SPRINTF_BUFFER_SIZE 65536
+
+static struct support_next_to_fault ntf;
+
+#define PREPARE printf_under_test_init
+static void
+printf_under_test_init (int argc, char **argv)
+{
+  ntf = support_next_to_fault_allocate (SPRINTF_BUFFER_SIZE);
+}
+
+static void __attribute__ ((destructor))
+printf_under_test_fini (void)
+{
+  support_next_to_fault_free (&ntf);
+}
+
+static int
+printf_under_test (const char *restrict fmt, ...)
+{
+  char *str = ntf.buffer;
+  va_list ap;
+  int result;
+
+  va_start (ap, fmt);
+  result = vsprintf (str, fmt, ap);
+  va_end (ap);
+  if (result < 0)
+    {
+      perror ("vsprintf");
+      goto out;
+    }
+  if (fwrite (str, sizeof (*str), result, stdout) != result)
+    {
+      perror ("fwrite");
+      result = -1;
+    }
+out:
+  return result;
+}