Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Update.
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.
  • Loading branch information
Ulrich Drepper committed Aug 14, 2001
1 parent 1b46e4a commit ecad39f
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 2 deletions.
7 changes: 7 additions & 0 deletions localedata/ChangeLog
@@ -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.
Expand Down
3 changes: 2 additions & 1 deletion localedata/Makefile
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down
5 changes: 4 additions & 1 deletion localedata/bug-iconv-trans.c
Expand Up @@ -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)
Expand Down

0 comments on commit ecad39f

Please sign in to comment.