about summary refs log tree commit diff
path: root/libio
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 /libio
parentc7b8939bf5646d1033375128f19261b401b9a0ce (diff)
downloadglibc-f881f6ff62bba53448c5d8997287ea2e628b3a65.tar.gz
glibc-f881f6ff62bba53448c5d8997287ea2e628b3a65.tar.xz
glibc-f881f6ff62bba53448c5d8997287ea2e628b3a65.zip
Add dependencies on needed locales in each subdir tests (bug 18969)
Diffstat (limited to 'libio')
-rw-r--r--libio/Makefile24
-rw-r--r--libio/tst_wprintf2.c2
2 files changed, 25 insertions, 1 deletions
diff --git a/libio/Makefile b/libio/Makefile
index a1d1741c95..273c2400ff 100644
--- a/libio/Makefile
+++ b/libio/Makefile
@@ -176,6 +176,30 @@ endif
 
 include ../Rules
 
+ifeq ($(run-built-tests),yes)
+LOCALES := de_DE.ISO-8859-1 de_DE.UTF-8 en_US.ISO-8859-1 en_US.UTF-8 \
+	   ja_JP.EUC-JP ja_JP.UTF-8
+include ../gen-locales.mk
+
+$(objpfx)bug-ftell.out: $(gen-locales)
+$(objpfx)bug-ungetwc1.out: $(gen-locales)
+$(objpfx)bug-ungetwc2.out: $(gen-locales)
+$(objpfx)tst-fgetwc.out: $(gen-locales)
+$(objpfx)tst-fgetws.out: $(gen-locales)
+$(objpfx)tst-fopenloc.out: $(gen-locales)
+$(objpfx)tst-fputws.out: $(gen-locales)
+$(objpfx)tst-fseek.out: $(gen-locales)
+$(objpfx)tst-ftell-active-handler.out: $(gen-locales)
+$(objpfx)tst-ftell-append.out: $(gen-locales)
+$(objpfx)tst-ftell-partial-wide.out: $(gen-locales)
+$(objpfx)tst-setvbuf1.out: $(gen-locales)
+$(objpfx)tst-swscanf.out: $(gen-locales)
+$(objpfx)tst-ungetwc1.out: $(gen-locales)
+$(objpfx)tst-ungetwc2.out: $(gen-locales)
+$(objpfx)tst-widetext.out: $(gen-locales)
+$(objpfx)tst_wprintf2.out: $(gen-locales)
+endif
+
 $(objpfx)test-freopen.out: test-freopen.sh $(objpfx)test-freopen
 	$(SHELL) $< $(common-objpfx) '$(test-program-prefix)'	\
 	$(common-objpfx)libio/; \
diff --git a/libio/tst_wprintf2.c b/libio/tst_wprintf2.c
index be0f29f53f..dfff70f1f9 100644
--- a/libio/tst_wprintf2.c
+++ b/libio/tst_wprintf2.c
@@ -26,7 +26,7 @@ main (int argc, char *argv[])
 
   unlink (name);
 
-  setlocale (LC_ALL, "");
+  setlocale (LC_ALL, "en_US.UTF-8");
 
   fp = fdopen (dup (fd), "w");
   if (fp == NULL)