aboutsummaryrefslogtreecommitdiff
path: root/wcsmbs
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@suse.de>2015-10-12 12:24:41 +0200
committerAndreas Schwab <schwab@suse.de>2015-10-12 15:18:08 +0200
commitf881f6ff62bba53448c5d8997287ea2e628b3a65 (patch)
tree404f7967786750db4513909c527088ff5783dd77 /wcsmbs
parentc7b8939bf5646d1033375128f19261b401b9a0ce (diff)
downloadglibc-f881f6ff62bba53448c5d8997287ea2e628b3a65.tar
glibc-f881f6ff62bba53448c5d8997287ea2e628b3a65.tar.gz
glibc-f881f6ff62bba53448c5d8997287ea2e628b3a65.tar.bz2
glibc-f881f6ff62bba53448c5d8997287ea2e628b3a65.zip
Add dependencies on needed locales in each subdir tests (bug 18969)
Diffstat (limited to 'wcsmbs')
-rw-r--r--wcsmbs/Makefile13
-rw-r--r--wcsmbs/wcsmbs-tst1.c2
2 files changed, 14 insertions, 1 deletions
diff --git a/wcsmbs/Makefile b/wcsmbs/Makefile
index dc72ba4ad5..a59a005a96 100644
--- a/wcsmbs/Makefile
+++ b/wcsmbs/Makefile
@@ -51,6 +51,19 @@ tests := tst-wcstof wcsmbs-tst1 tst-wcsnlen tst-btowc tst-mbrtowc \
include ../Rules
+ifeq ($(run-built-tests),yes)
+LOCALES := de_DE.ISO-8859-1 de_DE.UTF-8 en_US.ANSI_X3.4-1968 hr_HR.ISO-8859-2 \
+ ja_JP.EUC-JP zh_TW.EUC-TW
+include ../gen-locales.mk
+
+$(objpfx)tst-btowc.out: $(gen-locales)
+$(objpfx)tst-c16c32-1.out: $(gen-locales)
+$(objpfx)tst-mbrtowc.out: $(gen-locales)
+$(objpfx)tst-mbrtowc2.out: $(gen-locales)
+$(objpfx)tst-wcrtomb.out: $(gen-locales)
+$(objpfx)wcsmbs-tst1.out: $(gen-locales)
+endif
+
CFLAGS-wcwidth.c = -I../wctype
CFLAGS-wcswidth.c = -I../wctype
diff --git a/wcsmbs/wcsmbs-tst1.c b/wcsmbs/wcsmbs-tst1.c
index 9cdef45358..0d0e18f63a 100644
--- a/wcsmbs/wcsmbs-tst1.c
+++ b/wcsmbs/wcsmbs-tst1.c
@@ -18,7 +18,7 @@ main (void)
char str[] = "Hello";
int result = 0;
- pchar = setlocale (LC_ALL, "");
+ pchar = setlocale (LC_ALL, "de_DE.UTF-8");
printf ("locale : %s\n",pchar);
printf ("MB_CUR_MAX %Zd\n", MB_CUR_MAX);