From 2e23c3cc3fede8cc080af74f1b4f124b12955138 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Thu, 29 Jun 2000 07:13:12 +0000 Subject: Update. 2000-06-29 Andreas Jaeger * Makefile (locale_test_suite): Add new test files. (tst_mblen-ENV): New. (tst_mbtowc-ENV): New. (tst_strcoll-ENV): New. (tst_strxfrm-ENV): New. (tst_wctomb-ENV): New. * tests-mbwc/tst_wctomb.c: New test file from Shoji Kuwabara . * tests-mbwc/dat_wctomb.c: Likewise. * tests-mbwc/tst_mbtowc.c: Likewise. * tests-mbwc/dat_mbtowc.c: Likewise. * tests-mbwc/tst_strxfrm.c: Likewise. * tests-mbwc/dat_strxfrm.c: Likewise. * tests-mbwc/dat_strcoll.c: Likewise. * tests-mbwc/tst_strcoll.c: Likewise. * tests-mbwc/tst_mblen.c: Likewise. * tests-mbwc/dat_mblen.c: Likewise. --- localedata/Makefile | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'localedata/Makefile') diff --git a/localedata/Makefile b/localedata/Makefile index 2a4356d..fe6ea10 100644 --- a/localedata/Makefile +++ b/localedata/Makefile @@ -76,7 +76,6 @@ include ../Makeconfig ifeq (no,$(cross-compiling)) ifeq (yes,$(build-shared)) -# Disable the tests for now - first the locales have to be generated locale_test_suite := tst_iswalnum tst_iswprint tst_towctrans tst_wcsncmp \ tst_wctrans tst_iswalpha tst_iswpunct tst_wcschr \ tst_wcspbrk tst_wctype tst_iswcntrl tst_iswspace \ @@ -85,7 +84,10 @@ locale_test_suite := tst_iswalnum tst_iswprint tst_towctrans tst_wcsncmp \ tst_wcscspn tst_wcswidth tst_iswlower tst_swscanf \ tst_wcslen tst_wctob tst_iswctype tst_towlower \ tst_wcscat tst_towupper tst_wcscmp tst_wcsncat \ - tst_wcsncpy tst_wcsxfrm tst_wcwidth tst_mbrlen + tst_wcsncpy tst_wcsxfrm tst_wcwidth tst_mbrlen \ + tst_mblen tst_strcoll tst_strxfrm tst_mbtowc \ + tst_wctomb + tests = $(locale_test_suite) endif endif @@ -149,6 +151,7 @@ install-locales: $(inst_localedir)/$$locale; \ done < SUPPORTED +# The mbwc-tests need some environment setup to find the locale data files TEST_MBWC_ENV:= LOCPATH=$(common-objpfx)localedata tst_iswalnum-ENV = $(TEST_MBWC_ENV) tst_iswalpha-ENV = $(TEST_MBWC_ENV) @@ -162,7 +165,11 @@ tst_iswpunct-ENV = $(TEST_MBWC_ENV) tst_iswspace-ENV = $(TEST_MBWC_ENV) tst_iswupper-ENV = $(TEST_MBWC_ENV) tst_iswxdigit-ENV = $(TEST_MBWC_ENV) +tst_mblen-ENV = $(TEST_MBWC_ENV) tst_mbrlen-ENV = $(TEST_MBWC_ENV) +tst_mbtowc-ENV = $(TEST_MBWC_ENV) +tst_strcoll-ENV = $(TEST_MBWC_ENV) +tst_strxfrm-ENV = $(TEST_MBWC_ENV) tst_swscanf-ENV = $(TEST_MBWC_ENV) tst_towctrans-ENV = $(TEST_MBWC_ENV) tst_towlower-ENV = $(TEST_MBWC_ENV) @@ -183,6 +190,7 @@ tst_wcsstr-ENV = $(TEST_MBWC_ENV) tst_wcswidth-ENV = $(TEST_MBWC_ENV) tst_wcsxfrm-ENV = $(TEST_MBWC_ENV) tst_wctob-ENV = $(TEST_MBWC_ENV) +tst_wctomb-ENV = $(TEST_MBWC_ENV) tst_wctrans-ENV = $(TEST_MBWC_ENV) tst_wctype-ENV = $(TEST_MBWC_ENV) tst_wcwidth-ENV = $(TEST_MBWC_ENV) -- cgit v1.1