From 9b1a4ec37109f437aa8ca4334a6b2d31bdfb8cd4 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Tue, 26 Nov 2002 02:22:06 +0000 Subject: Update. 2002-11-25 Ulrich Drepper * iconv/Makefile (tests): Remove tst-iconv4.c * iconv/tst-iconv4.c: Moved to... * iconvdata/tst-iconv4.c: ...here. New file. * iconvdata/Makefile (tests): Add tst-iconv4. Add dependencies. --- ChangeLog | 7 +++++++ iconv/tst-iconv4.c | 44 -------------------------------------------- iconvdata/Makefile | 4 +++- iconvdata/tst-iconv4.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 54 insertions(+), 45 deletions(-) delete mode 100644 iconv/tst-iconv4.c create mode 100644 iconvdata/tst-iconv4.c diff --git a/ChangeLog b/ChangeLog index f2b1a88987..be335e49ff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2002-11-25 Ulrich Drepper + + * iconv/Makefile (tests): Remove tst-iconv4.c + * iconv/tst-iconv4.c: Moved to... + * iconvdata/tst-iconv4.c: ...here. New file. + * iconvdata/Makefile (tests): Add tst-iconv4. Add dependencies. + 2002-11-25 Roland McGrath * sysdeps/mach/hurd/i386/init-first.c: Include diff --git a/iconv/tst-iconv4.c b/iconv/tst-iconv4.c deleted file mode 100644 index e099ca8715..0000000000 --- a/iconv/tst-iconv4.c +++ /dev/null @@ -1,44 +0,0 @@ -#include -#include -#include -#include -#include - - -static int -do_test (void) -{ - iconv_t cd = iconv_open ("ISO-8859-1", "UNICODE"); - if (cd == (iconv_t) -1) - { - printf ("iconv_open failed: %m\n"); - exit (EXIT_FAILURE); - } - - char instr[] = "a"; - char *inptr = instr; - size_t inlen = strlen (instr); - char buf[200]; - char *outptr = buf; - size_t outlen = sizeof (outptr); - - errno = 0; - size_t n = iconv (cd, &inptr, &inlen, &outptr, &outlen); - if (n != (size_t) -1) - { - printf ("n (= %zu) != (size_t) -1\n", n); - exit (EXIT_FAILURE); - } - if (errno != EINVAL) - { - printf ("errno = %m, not EINVAL\n"); - exit (EXIT_FAILURE); - } - - iconv_close (cd); - - return 0; -} - -#define TEST_FUNCTION do_test () -#include "../test-skeleton.c" diff --git a/iconvdata/Makefile b/iconvdata/Makefile index 413ab05230..0b36ead013 100644 --- a/iconvdata/Makefile +++ b/iconvdata/Makefile @@ -58,7 +58,7 @@ modules.so := $(addsuffix .so, $(modules)) include ../Makeconfig ifeq (yes,$(build-shared)) -tests = bug-iconv1 bug-iconv2 tst-loading tst-e2big +tests = bug-iconv1 bug-iconv2 tst-loading tst-e2big tst-iconv4 test-srcs := tst-table-from tst-table-to endif @@ -321,6 +321,8 @@ $(objpfx)bug-iconv2.out: $(objpfx)gconv-modules \ $(addprefix $(objpfx),$(modules.so)) $(objpfx)tst-loading.out: $(objpfx)gconv-modules \ $(addprefix $(objpfx),$(modules.so)) +$(objpfx)tst-iconv4.out: $(objpfx)gconv-modules \ + $(addprefix $(objpfx),$(modules.so)) $(objpfx)iconv-test.out: run-iconv-test.sh $(objpfx)gconv-modules \ $(addprefix $(objpfx),$(modules.so)) \ diff --git a/iconvdata/tst-iconv4.c b/iconvdata/tst-iconv4.c new file mode 100644 index 0000000000..e099ca8715 --- /dev/null +++ b/iconvdata/tst-iconv4.c @@ -0,0 +1,44 @@ +#include +#include +#include +#include +#include + + +static int +do_test (void) +{ + iconv_t cd = iconv_open ("ISO-8859-1", "UNICODE"); + if (cd == (iconv_t) -1) + { + printf ("iconv_open failed: %m\n"); + exit (EXIT_FAILURE); + } + + char instr[] = "a"; + char *inptr = instr; + size_t inlen = strlen (instr); + char buf[200]; + char *outptr = buf; + size_t outlen = sizeof (outptr); + + errno = 0; + size_t n = iconv (cd, &inptr, &inlen, &outptr, &outlen); + if (n != (size_t) -1) + { + printf ("n (= %zu) != (size_t) -1\n", n); + exit (EXIT_FAILURE); + } + if (errno != EINVAL) + { + printf ("errno = %m, not EINVAL\n"); + exit (EXIT_FAILURE); + } + + iconv_close (cd); + + return 0; +} + +#define TEST_FUNCTION do_test () +#include "../test-skeleton.c" -- cgit v1.2.3