2024-06-30 Bruno Haible <bruno@clisp.org>
+ dzprintf-gnu: Add tests.
+ * tests/test-dprintf-gnu.h: New file, extracted from
+ tests/test-dprintf-gnu.c.
+ * tests/test-dprintf-gnu.c: Include it.
+ (test_function): Remove function.
+ * modules/dprintf-gnu-tests (Files): Add it.
+ * tests/test-dzprintf-gnu.c: New file, based on
+ tests/test-dprintf-gnu.c.
+ * tests/test-dzprintf-gnu.sh: New file, based on
+ tests/test-dprintf-gnu.sh.
+ * modules/dzprintf-gnu-tests: New file.
+
dzprintf-gnu: New module.
* modules/dzprintf-gnu: New file.
Files:
tests/test-dprintf-gnu.sh
tests/test-dprintf-gnu.c
+tests/test-dprintf-gnu.h
tests/test-printf-gnu.output
tests/macros.h
--- /dev/null
+Files:
+tests/test-dzprintf-gnu.sh
+tests/test-dzprintf-gnu.c
+tests/test-dprintf-gnu.h
+tests/test-printf-gnu.output
+tests/macros.h
+
+Depends-on:
+stdint
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-dzprintf-gnu.sh
+check_PROGRAMS += test-dzprintf-gnu
#include "macros.h"
-static void
-test_function (int (*my_dprintf) (int, const char *, ...))
-{
- /* Here we don't test output that may be platform dependent.
- The bulk of the tests is done as part of the 'vasnprintf-posix' module. */
-
- /* Test the support of the 'B' conversion specifier for binary output of
- integers. */
-
- /* Zero. */
- my_dprintf (fileno (stdout), "%B %d\n", 0, 33, 44, 55);
-
- /* A positive number. */
- my_dprintf (fileno (stdout), "%B %d\n", 12345, 33, 44, 55);
-
- /* A large positive number. */
- my_dprintf (fileno (stdout), "%B %d\n", 0xFFFFFFFEU, 33, 44, 55);
-
- /* Width. */
- my_dprintf (fileno (stdout), "%20B %d\n", 12345, 33, 44, 55);
-
- /* Width given as argument. */
- my_dprintf (fileno (stdout), "%*B %d\n", 20, 12345, 33, 44, 55);
-
- /* Negative width given as argument (cf. FLAG_LEFT below). */
- my_dprintf (fileno (stdout), "%*B %d\n", -20, 12345, 33, 44, 55);
-
- /* Precision. */
- my_dprintf (fileno (stdout), "%.20B %d\n", 12345, 33, 44, 55);
-
- /* Zero precision and a positive number. */
- my_dprintf (fileno (stdout), "%.0B %d\n", 12345, 33, 44, 55);
-
- /* Zero precision and a zero number. */
- my_dprintf (fileno (stdout), "%.0B %d\n", 0, 33, 44, 55);
-
- /* Width and precision. */
- my_dprintf (fileno (stdout), "%25.20B %d\n", 12345, 33, 44, 55);
-
- /* FLAG_LEFT. */
- my_dprintf (fileno (stdout), "%-20B %d\n", 12345, 33, 44, 55);
-
- /* FLAG_ALT with zero. */
- my_dprintf (fileno (stdout), "%#B %d\n", 0, 33, 44, 55);
-
- /* FLAG_ALT with a positive number. */
- my_dprintf (fileno (stdout), "%#B %d\n", 12345, 33, 44, 55);
-
- /* FLAG_ALT with a positive number and width. */
- my_dprintf (fileno (stdout), "%#20B %d\n", 12345, 33, 44, 55);
-
- /* FLAG_ALT with a positive number and padding. */
- my_dprintf (fileno (stdout), "%0#20B %d\n", 12345, 33, 44, 55);
-
- /* FLAG_ALT with a positive number and precision. */
- my_dprintf (fileno (stdout), "%0#.20B %d\n", 12345, 33, 44, 55);
-
- /* FLAG_ALT with a positive number and width and precision. */
- my_dprintf (fileno (stdout), "%#25.20B %d\n", 12345, 33, 44, 55);
-
- /* FLAG_ALT with a zero precision and a zero number. */
- my_dprintf (fileno (stdout), "%#.0B %d\n", 0, 33, 44, 55);
-}
+#define RETTYPE int
+#include "test-dprintf-gnu.h"
int
main (int argc, char *argv[])
--- /dev/null
+/* Test of POSIX and GNU compatible d[z]printf() function.
+ Copyright (C) 2007-2024 Free Software Foundation, Inc.
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program 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 General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <https://www.gnu.org/licenses/>. */
+
+/* Written by Bruno Haible <bruno@clisp.org>, 2023. */
+
+static void
+test_function (RETTYPE (*my_dprintf) (int, const char *, ...))
+{
+ /* Here we don't test output that may be platform dependent.
+ The bulk of the tests is done as part of the 'vasnprintf-posix' module. */
+
+ /* Test the support of the 'B' conversion specifier for binary output of
+ integers. */
+
+ /* Zero. */
+ my_dprintf (fileno (stdout), "%B %d\n", 0, 33, 44, 55);
+
+ /* A positive number. */
+ my_dprintf (fileno (stdout), "%B %d\n", 12345, 33, 44, 55);
+
+ /* A large positive number. */
+ my_dprintf (fileno (stdout), "%B %d\n", 0xFFFFFFFEU, 33, 44, 55);
+
+ /* Width. */
+ my_dprintf (fileno (stdout), "%20B %d\n", 12345, 33, 44, 55);
+
+ /* Width given as argument. */
+ my_dprintf (fileno (stdout), "%*B %d\n", 20, 12345, 33, 44, 55);
+
+ /* Negative width given as argument (cf. FLAG_LEFT below). */
+ my_dprintf (fileno (stdout), "%*B %d\n", -20, 12345, 33, 44, 55);
+
+ /* Precision. */
+ my_dprintf (fileno (stdout), "%.20B %d\n", 12345, 33, 44, 55);
+
+ /* Zero precision and a positive number. */
+ my_dprintf (fileno (stdout), "%.0B %d\n", 12345, 33, 44, 55);
+
+ /* Zero precision and a zero number. */
+ my_dprintf (fileno (stdout), "%.0B %d\n", 0, 33, 44, 55);
+
+ /* Width and precision. */
+ my_dprintf (fileno (stdout), "%25.20B %d\n", 12345, 33, 44, 55);
+
+ /* FLAG_LEFT. */
+ my_dprintf (fileno (stdout), "%-20B %d\n", 12345, 33, 44, 55);
+
+ /* FLAG_ALT with zero. */
+ my_dprintf (fileno (stdout), "%#B %d\n", 0, 33, 44, 55);
+
+ /* FLAG_ALT with a positive number. */
+ my_dprintf (fileno (stdout), "%#B %d\n", 12345, 33, 44, 55);
+
+ /* FLAG_ALT with a positive number and width. */
+ my_dprintf (fileno (stdout), "%#20B %d\n", 12345, 33, 44, 55);
+
+ /* FLAG_ALT with a positive number and padding. */
+ my_dprintf (fileno (stdout), "%0#20B %d\n", 12345, 33, 44, 55);
+
+ /* FLAG_ALT with a positive number and precision. */
+ my_dprintf (fileno (stdout), "%0#.20B %d\n", 12345, 33, 44, 55);
+
+ /* FLAG_ALT with a positive number and width and precision. */
+ my_dprintf (fileno (stdout), "%#25.20B %d\n", 12345, 33, 44, 55);
+
+ /* FLAG_ALT with a zero precision and a zero number. */
+ my_dprintf (fileno (stdout), "%#.0B %d\n", 0, 33, 44, 55);
+}
--- /dev/null
+/* Test of POSIX and GNU compatible dzprintf() function.
+ Copyright (C) 2007-2024 Free Software Foundation, Inc.
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program 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 General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <https://www.gnu.org/licenses/>. */
+
+/* Written by Bruno Haible <bruno@clisp.org>, 2023. */
+
+#include <config.h>
+
+#include <stdio.h>
+
+#include <stddef.h>
+#include <string.h>
+
+#include "macros.h"
+
+#define RETTYPE off64_t
+#include "test-dprintf-gnu.h"
+
+int
+main (int argc, char *argv[])
+{
+ test_function (dzprintf);
+ return test_exit_status;
+}
--- /dev/null
+#!/bin/sh
+
+tmpfiles=""
+trap 'rm -fr $tmpfiles' HUP INT QUIT TERM
+
+tmpfiles="$tmpfiles t-dzprintf-gnu.tmp t-dzprintf-gnu.out"
+${CHECKER} ./test-dzprintf-gnu${EXEEXT} > t-dzprintf-gnu.tmp || exit 1
+LC_ALL=C tr -d '\r' < t-dzprintf-gnu.tmp > t-dzprintf-gnu.out || exit 1
+
+: "${DIFF=diff}"
+${DIFF} "${srcdir}/test-printf-gnu.output" t-dzprintf-gnu.out
+result=$?
+
+rm -fr $tmpfiles
+
+exit $result