From 2d285c761e2b052a6381aef263ee03d773e956b3 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Mon, 8 Mar 2010 02:59:04 +0100 Subject: [PATCH] Tests of module 'wchar' in C++ mode. --- ChangeLog | 8 ++++ m4/wchar_h.m4 | 4 +- modules/wchar-tests | 9 +++++ tests/test-wchar-c++.cc | 82 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 102 insertions(+), 1 deletion(-) create mode 100644 tests/test-wchar-c++.cc diff --git a/ChangeLog b/ChangeLog index 3b5d17f8fc..ce697d16de 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2010-03-07 Bruno Haible + Tests of module 'wchar' in C++ mode. + * tests/test-wchar-c++.cc: New file. + * modules/wchar-tests (Files): Add it and tests/signature.h. + (Depends-on): Add ansi-c++-opt. + (Makefile.am): Arrange to compile and run test-wchar-c++. + * m4/wchar_h.m4 (gl_WCHAR_MODULE_INDICATOR): Invoke + gl_MODULE_INDICATOR. + Tests of module 'unistd' in C++ mode. * tests/test-unistd-c++.cc: New file. * modules/unistd-tests (Files): Add it and tests/signature.h. diff --git a/m4/wchar_h.m4 b/m4/wchar_h.m4 index e3c7210a73..0bce51c6bb 100644 --- a/m4/wchar_h.m4 +++ b/m4/wchar_h.m4 @@ -7,7 +7,7 @@ dnl with or without modifications, as long as this notice is preserved. dnl Written by Eric Blake. -# wchar_h.m4 serial 31 +# wchar_h.m4 serial 32 AC_DEFUN([gl_WCHAR_H], [ @@ -108,6 +108,8 @@ AC_DEFUN([gl_WCHAR_MODULE_INDICATOR], dnl Use AC_REQUIRE here, so that the default settings are expanded once only. AC_REQUIRE([gl_WCHAR_H_DEFAULTS]) GNULIB_[]m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./-],[ABCDEFGHIJKLMNOPQRSTUVWXYZ___])=1 + dnl Define it also as a C macro, for the benefit of the unit tests. + gl_MODULE_INDICATOR([$1]) ]) AC_DEFUN([gl_WCHAR_H_DEFAULTS], diff --git a/modules/wchar-tests b/modules/wchar-tests index b98622c743..14ed4c483f 100644 --- a/modules/wchar-tests +++ b/modules/wchar-tests @@ -1,11 +1,20 @@ Files: tests/test-wchar.c +tests/test-wchar-c++.cc +tests/signature.h Depends-on: verify +ansi-c++-opt configure.ac: Makefile.am: TESTS += test-wchar check_PROGRAMS += test-wchar +if ANSICXX +TESTS += test-wchar-c++ +check_PROGRAMS += test-wchar-c++ +test_wchar_c___SOURCES = test-wchar-c++.cc +test_wchar_c___LDADD = $(LDADD) $(LIBINTL) +endif diff --git a/tests/test-wchar-c++.cc b/tests/test-wchar-c++.cc new file mode 100644 index 0000000000..7cfce9bf01 --- /dev/null +++ b/tests/test-wchar-c++.cc @@ -0,0 +1,82 @@ +/* Test of substitute in C++ mode. + Copyright (C) 2010 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 . */ + +/* Written by Bruno Haible , 2010. */ + +#define GNULIB_NAMESPACE gnulib +#include + +#include + +#include "signature.h" + + +#if GNULIB_BTOWC +SIGNATURE_CHECK (GNULIB_NAMESPACE::btowc, wint_t, (int)); +#endif + +#if GNULIB_WCTOB +SIGNATURE_CHECK (GNULIB_NAMESPACE::wctob, int, (wint_t)); +#endif + +#if GNULIB_MBSINIT +SIGNATURE_CHECK (GNULIB_NAMESPACE::mbsinit, int, (const mbstate_t *)); +#endif + +#if GNULIB_MBRTOWC +SIGNATURE_CHECK (GNULIB_NAMESPACE::mbrtowc, size_t, + (wchar_t *, const char *, size_t, mbstate_t *)); +#endif + +#if GNULIB_MBRLEN +SIGNATURE_CHECK (GNULIB_NAMESPACE::mbrlen, size_t, + (const char *, size_t, mbstate_t *)); +#endif + +#if GNULIB_MBSRTOWCS +SIGNATURE_CHECK (GNULIB_NAMESPACE::mbsrtowcs, size_t, + (wchar_t *, const char **, size_t, mbstate_t *)); +#endif + +#if GNULIB_MBSNRTOWCS +SIGNATURE_CHECK (GNULIB_NAMESPACE::mbsnrtowcs, size_t, + (wchar_t *, const char **, size_t, size_t, mbstate_t *)); +#endif + +#if GNULIB_WCRTOMB +SIGNATURE_CHECK (GNULIB_NAMESPACE::wcrtomb, size_t, + (char *, wchar_t, mbstate_t *)); +#endif + +#if GNULIB_WCSRTOMBS +SIGNATURE_CHECK (GNULIB_NAMESPACE::wcsrtombs, size_t, + (char *, const wchar_t **, size_t, mbstate_t *)); +#endif + +#if GNULIB_WCSNRTOMBS +SIGNATURE_CHECK (GNULIB_NAMESPACE::wcsnrtombs, size_t, + (char *, const wchar_t **, size_t, size_t, mbstate_t *)); +#endif + +#if GNULIB_WCWIDTH +SIGNATURE_CHECK (GNULIB_NAMESPACE::wcwidth, int, (wchar_t)); +#endif + + +int +main () +{ +} -- 2.30.2