>From 4c7a6ab152c0e68c156abbc664966f109049353c Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 4 Jan 2020 10:07:12 +0100 Subject: [PATCH 2/2] btoc32: Add tests. * tests/test-btoc32.c: New file, based on tests/test-btowc.c. * tests/test-btoc32-1.sh: New file, based on tests/test-btowc1.sh. * tests/test-btoc32-2.sh: New file, based on tests/test-btowc2.sh. * modules/btoc32-tests: New file, based on modules/btowc-tests. --- ChangeLog | 6 +++++ modules/btoc32-tests | 21 +++++++++++++++++ tests/test-btoc32-1.sh | 15 ++++++++++++ tests/test-btoc32-2.sh | 15 ++++++++++++ tests/test-btoc32.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 121 insertions(+) create mode 100644 modules/btoc32-tests create mode 100755 tests/test-btoc32-1.sh create mode 100755 tests/test-btoc32-2.sh create mode 100644 tests/test-btoc32.c diff --git a/ChangeLog b/ChangeLog index 80fe741..aa54dd7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2020-01-04 Bruno Haible + btoc32: Add tests. + * tests/test-btoc32.c: New file, based on tests/test-btowc.c. + * tests/test-btoc32-1.sh: New file, based on tests/test-btowc1.sh. + * tests/test-btoc32-2.sh: New file, based on tests/test-btowc2.sh. + * modules/btoc32-tests: New file, based on modules/btowc-tests. + btoc32: New module. * lib/uchar.in.h (btoc32): New declaration. * lib/btoc32.c: New file. diff --git a/modules/btoc32-tests b/modules/btoc32-tests new file mode 100644 index 0000000..95900d5 --- /dev/null +++ b/modules/btoc32-tests @@ -0,0 +1,21 @@ +Files: +tests/test-btoc32-1.sh +tests/test-btoc32-2.sh +tests/test-btoc32.c +tests/signature.h +tests/macros.h +m4/locale-fr.m4 +m4/codeset.m4 + +Depends-on: +setlocale + +configure.ac: +gt_LOCALE_FR +gt_LOCALE_FR_UTF8 + +Makefile.am: +TESTS += test-btoc32-1.sh test-btoc32-2.sh +TESTS_ENVIRONMENT += LOCALE_FR='@LOCALE_FR@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' +check_PROGRAMS += test-btoc32 +test_btoc32_LDADD = $(LDADD) $(LIB_SETLOCALE) diff --git a/tests/test-btoc32-1.sh b/tests/test-btoc32-1.sh new file mode 100755 index 0000000..ce860ae --- /dev/null +++ b/tests/test-btoc32-1.sh @@ -0,0 +1,15 @@ +#!/bin/sh + +# Test in an ISO-8859-1 or ISO-8859-15 locale. +: ${LOCALE_FR=fr_FR} +if test $LOCALE_FR = none; then + if test -f /usr/bin/localedef; then + echo "Skipping test: no traditional french locale is installed" + else + echo "Skipping test: no traditional french locale is supported" + fi + exit 77 +fi + +LC_ALL=$LOCALE_FR \ +${CHECKER} ./test-btoc32${EXEEXT} 1 diff --git a/tests/test-btoc32-2.sh b/tests/test-btoc32-2.sh new file mode 100755 index 0000000..b9cdb99 --- /dev/null +++ b/tests/test-btoc32-2.sh @@ -0,0 +1,15 @@ +#!/bin/sh + +# Test whether a specific UTF-8 locale is installed. +: ${LOCALE_FR_UTF8=fr_FR.UTF-8} +if test $LOCALE_FR_UTF8 = none; then + if test -f /usr/bin/localedef; then + echo "Skipping test: no french Unicode locale is installed" + else + echo "Skipping test: no french Unicode locale is supported" + fi + exit 77 +fi + +LC_ALL=$LOCALE_FR_UTF8 \ +${CHECKER} ./test-btoc32${EXEEXT} 2 diff --git a/tests/test-btoc32.c b/tests/test-btoc32.c new file mode 100644 index 0000000..f5cfbe4 --- /dev/null +++ b/tests/test-btoc32.c @@ -0,0 +1,64 @@ +/* Test of conversion of unibyte character to 32-bit wide character. + Copyright (C) 2008-2020 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 , 2008. */ + +#include + +#include + +#include "signature.h" +SIGNATURE_CHECK (btoc32, wint_t, (int)); + +#include +#include +#include + +#include "macros.h" + +int +main (int argc, char *argv[]) +{ + int c; + + /* configure should already have checked that the locale is supported. */ + if (setlocale (LC_ALL, "") == NULL) + return 1; + + ASSERT (btoc32 (EOF) == WEOF); + + if (argc > 1) + switch (argv[1][0]) + { + case '1': + /* Locale encoding is ISO-8859-1 or ISO-8859-15. */ + for (c = 0; c < 0x80; c++) + ASSERT (btoc32 (c) == c); + for (c = 0xA0; c < 0x100; c++) + ASSERT (btoc32 (c) != WEOF); + return 0; + + case '2': + /* Locale encoding is UTF-8. */ + for (c = 0; c < 0x80; c++) + ASSERT (btoc32 (c) == c); + for (c = 0x80; c < 0x100; c++) + ASSERT (btoc32 (c) == WEOF); + return 0; + } + + return 1; +} -- 2.7.4