e56f6d3b52
Resolves: RHEL-46725
429 lines
18 KiB
Diff
429 lines
18 KiB
Diff
commit bad554d9b4f10988eb7fdb814fbaa5e89416d781
|
|
Author: Maciej W. Rozycki <macro@redhat.com>
|
|
Date: Thu Nov 7 06:14:24 2024 +0000
|
|
|
|
stdio-common: Add tests for formatted vprintf output specifiers
|
|
|
|
Wire vprintf into test infrastructure for formatted printf output
|
|
specifiers.
|
|
|
|
Reviewed-by: DJ Delorie <dj@redhat.com>
|
|
|
|
diff --git a/stdio-common/Makefile b/stdio-common/Makefile
|
|
index 88b89ce13ffbadc4..fd34891ea439c684 100644
|
|
--- a/stdio-common/Makefile
|
|
+++ b/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
|
|
+xprintf-funcs := p as d f s sn v
|
|
|
|
# List of data types and formats for individual per-conversion printf tests.
|
|
fmt-convs := double ldouble
|
|
diff --git a/stdio-common/tst-printf-format-v-c.c b/stdio-common/tst-printf-format-v-c.c
|
|
new file mode 100644
|
|
index 0000000000000000..94aa3042aaee6d97
|
|
--- /dev/null
|
|
+++ b/stdio-common/tst-printf-format-v-c.c
|
|
@@ -0,0 +1,20 @@
|
|
+/* Test for formatted 'vprintf' 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-v.h"
|
|
+#include "tst-printf-format-skeleton-c.c"
|
|
diff --git a/stdio-common/tst-printf-format-v-char.c b/stdio-common/tst-printf-format-v-char.c
|
|
new file mode 100644
|
|
index 0000000000000000..c813d81e53956295
|
|
--- /dev/null
|
|
+++ b/stdio-common/tst-printf-format-v-char.c
|
|
@@ -0,0 +1,20 @@
|
|
+/* Test for formatted 'vprintf' 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-v.h"
|
|
+#include "tst-printf-format-skeleton-char.c"
|
|
diff --git a/stdio-common/tst-printf-format-v-double.c b/stdio-common/tst-printf-format-v-double.c
|
|
new file mode 100644
|
|
index 0000000000000000..90cc1704eb3da2f3
|
|
--- /dev/null
|
|
+++ b/stdio-common/tst-printf-format-v-double.c
|
|
@@ -0,0 +1,20 @@
|
|
+/* Test for formatted 'vprintf' 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-v.h"
|
|
+#include "tst-printf-format-skeleton-double.c"
|
|
diff --git a/stdio-common/tst-printf-format-v-int.c b/stdio-common/tst-printf-format-v-int.c
|
|
new file mode 100644
|
|
index 0000000000000000..6529425b263975c8
|
|
--- /dev/null
|
|
+++ b/stdio-common/tst-printf-format-v-int.c
|
|
@@ -0,0 +1,20 @@
|
|
+/* Test for formatted 'vprintf' 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-v.h"
|
|
+#include "tst-printf-format-skeleton-int.c"
|
|
diff --git a/stdio-common/tst-printf-format-v-ldouble.c b/stdio-common/tst-printf-format-v-ldouble.c
|
|
new file mode 100644
|
|
index 0000000000000000..813f4a510dc833cc
|
|
--- /dev/null
|
|
+++ b/stdio-common/tst-printf-format-v-ldouble.c
|
|
@@ -0,0 +1,20 @@
|
|
+/* Test for formatted 'vprintf' 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-v.h"
|
|
+#include "tst-printf-format-skeleton-ldouble.c"
|
|
diff --git a/stdio-common/tst-printf-format-v-llong.c b/stdio-common/tst-printf-format-v-llong.c
|
|
new file mode 100644
|
|
index 0000000000000000..270ad08bf5e948fd
|
|
--- /dev/null
|
|
+++ b/stdio-common/tst-printf-format-v-llong.c
|
|
@@ -0,0 +1,20 @@
|
|
+/* Test for formatted 'vprintf' 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-v.h"
|
|
+#include "tst-printf-format-skeleton-llong.c"
|
|
diff --git a/stdio-common/tst-printf-format-v-long.c b/stdio-common/tst-printf-format-v-long.c
|
|
new file mode 100644
|
|
index 0000000000000000..2f5f653fecb25040
|
|
--- /dev/null
|
|
+++ b/stdio-common/tst-printf-format-v-long.c
|
|
@@ -0,0 +1,20 @@
|
|
+/* Test for formatted 'vprintf' 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-v.h"
|
|
+#include "tst-printf-format-skeleton-long.c"
|
|
diff --git a/stdio-common/tst-printf-format-v-s.c b/stdio-common/tst-printf-format-v-s.c
|
|
new file mode 100644
|
|
index 0000000000000000..ebc253b3e83291f2
|
|
--- /dev/null
|
|
+++ b/stdio-common/tst-printf-format-v-s.c
|
|
@@ -0,0 +1,20 @@
|
|
+/* Test for formatted 'vprintf' 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-v.h"
|
|
+#include "tst-printf-format-skeleton-s.c"
|
|
diff --git a/stdio-common/tst-printf-format-v-short.c b/stdio-common/tst-printf-format-v-short.c
|
|
new file mode 100644
|
|
index 0000000000000000..92a59d9fd3972f1e
|
|
--- /dev/null
|
|
+++ b/stdio-common/tst-printf-format-v-short.c
|
|
@@ -0,0 +1,20 @@
|
|
+/* Test for formatted 'vprintf' 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-v.h"
|
|
+#include "tst-printf-format-skeleton-short.c"
|
|
diff --git a/stdio-common/tst-printf-format-v-uchar.c b/stdio-common/tst-printf-format-v-uchar.c
|
|
new file mode 100644
|
|
index 0000000000000000..045ffd2864f8158f
|
|
--- /dev/null
|
|
+++ b/stdio-common/tst-printf-format-v-uchar.c
|
|
@@ -0,0 +1,20 @@
|
|
+/* Test for formatted 'vprintf' 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-v.h"
|
|
+#include "tst-printf-format-skeleton-uchar.c"
|
|
diff --git a/stdio-common/tst-printf-format-v-uint.c b/stdio-common/tst-printf-format-v-uint.c
|
|
new file mode 100644
|
|
index 0000000000000000..17b1ce3aa7780209
|
|
--- /dev/null
|
|
+++ b/stdio-common/tst-printf-format-v-uint.c
|
|
@@ -0,0 +1,20 @@
|
|
+/* Test for formatted 'vprintf' 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-v.h"
|
|
+#include "tst-printf-format-skeleton-uint.c"
|
|
diff --git a/stdio-common/tst-printf-format-v-ullong.c b/stdio-common/tst-printf-format-v-ullong.c
|
|
new file mode 100644
|
|
index 0000000000000000..590b04f339e01cf6
|
|
--- /dev/null
|
|
+++ b/stdio-common/tst-printf-format-v-ullong.c
|
|
@@ -0,0 +1,20 @@
|
|
+/* Test for formatted 'vprintf' 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-v.h"
|
|
+#include "tst-printf-format-skeleton-ullong.c"
|
|
diff --git a/stdio-common/tst-printf-format-v-ulong.c b/stdio-common/tst-printf-format-v-ulong.c
|
|
new file mode 100644
|
|
index 0000000000000000..6747677a42b38e37
|
|
--- /dev/null
|
|
+++ b/stdio-common/tst-printf-format-v-ulong.c
|
|
@@ -0,0 +1,20 @@
|
|
+/* Test for formatted 'vprintf' 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-v.h"
|
|
+#include "tst-printf-format-skeleton-ulong.c"
|
|
diff --git a/stdio-common/tst-printf-format-v-ushort.c b/stdio-common/tst-printf-format-v-ushort.c
|
|
new file mode 100644
|
|
index 0000000000000000..1e782715627f7b77
|
|
--- /dev/null
|
|
+++ b/stdio-common/tst-printf-format-v-ushort.c
|
|
@@ -0,0 +1,20 @@
|
|
+/* Test for formatted 'vprintf' 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-v.h"
|
|
+#include "tst-printf-format-skeleton-ushort.c"
|
|
diff --git a/stdio-common/tst-printf-format-v.h b/stdio-common/tst-printf-format-v.h
|
|
new file mode 100644
|
|
index 0000000000000000..711b290b59df8781
|
|
--- /dev/null
|
|
+++ b/stdio-common/tst-printf-format-v.h
|
|
@@ -0,0 +1,34 @@
|
|
+/* Test feature wrapper for formatted 'vprintf' 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>
|
|
+
|
|
+static int
|
|
+printf_under_test (const char *restrict fmt, ...)
|
|
+{
|
|
+ va_list ap;
|
|
+ int result;
|
|
+
|
|
+ va_start (ap, fmt);
|
|
+ result = vprintf (fmt, ap);
|
|
+ va_end (ap);
|
|
+ if (result < 0)
|
|
+ perror ("vprintf");
|
|
+ return result;
|
|
+}
|