2001-08-14  Ulrich Drepper  <drepper@redhat.com>

	* Makefile: Add rules to build and run tst-xlocale1.
	* tst-xlocale1.c: New file.

	* bug-iconv-trans.c: Improve error messages.
This commit is contained in:
Ulrich Drepper 2001-08-14 22:29:43 +00:00
parent 1b46e4a5a2
commit ecad39f050
3 changed files with 13 additions and 2 deletions

View File

@ -1,3 +1,10 @@
2001-08-14 Ulrich Drepper <drepper@redhat.com>
* Makefile: Add rules to build and run tst-xlocale1.
* tst-xlocale1.c: New file.
* bug-iconv-trans.c: Improve error messages.
2001-08-12 Ulrich Drepper <drepper@redhat.com>
* charmaps/ISO-IR-209: New file.

View File

@ -91,7 +91,7 @@ locale_test_suite := tst_iswalnum tst_iswalpha tst_iswcntrl \
tst_wctype tst_wcwidth
tests = $(locale_test_suite) tst-digits tst-setlocale bug-iconv-trans \
tst-leaks tst-mbswcs6
tst-leaks tst-mbswcs6 tst-xlocale1
ifeq (yes,$(build-shared))
ifneq (no,$(PERL))
tests: $(objpfx)mtrace-tst-leaks
@ -271,6 +271,7 @@ tst_wctype-ENV = $(TEST_MBWC_ENV)
tst_wcwidth-ENV = $(TEST_MBWC_ENV)
tst-digits-ENV = $(TEST_MBWC_ENV)
tst-mbswcs6-ENV = $(TEST_MBWC_ENV)
tst-xlocale1-ENV = $(TEST_MBWC_ENV)
tst-setlocale-ENV = LOCPATH=$(common-objpfx)localedata LC_ALL=ja_JP.EUC-JP

View File

@ -33,7 +33,10 @@ main (void)
n = iconv (cd, &inptr, &inlen, &outptr, &outlen);
if (n != 7)
{
printf ("iconv() returned %Zd, expected 7\n", n);
if (n == (size_t) -1)
printf ("iconv() returned error: %m\n");
else
printf ("iconv() returned %Zd, expected 7\n", n);
result = 1;
}
if (inlen != 0)