* Makefile (TEST_MBWC_ENV): New variable.

Use it for all tests from tests-mbwc.

1 files changed, 38 insertions, 37 deletions

diff --git a/localedata/Makefile b/localedata/Makefile
index ce840c41b1..0330a973f3 100644
--- a/localedata/Makefile
+++ b/localedata/Makefile
@@ -42,8 +42,8 @@ repertoiremaps := $(filter-out $(addprefix repertoiremaps/, CVS RCS SCCS %~), \
 #	  tst_iswupper tst_wcscpy tst_wcsstr tst_iswgraph tst_iswxdigit	 \
 #	  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_wcscmp tst_wcsncat tst_wcsncpy tst_wcsxfrm tst_wcwidth
+
 
 subdir-dirs = tests-mbwc
 vpath %.c tests-mbwc
@@ -138,38 +138,39 @@ install-locales:
 			$(inst_localedir)/$$locale; \
 	done < SUPPORTED
 
-tst_iswalnum-ENV = LOCPATH=$(common-objpfx)/localedata
-tst_iswalpha-ENV = LOCPATH=$(common-objpfx)/localedata
-tst_iswcntrl-ENV = LOCPATH=$(common-objpfx)/localedata
-tst_iswctype-ENV = LOCPATH=$(common-objpfx)/localedata
-tst_iswdigit-ENV = LOCPATH=$(common-objpfx)/localedata
-tst_iswgraph-ENV = LOCPATH=$(common-objpfx)/localedata
-tst_iswlower-ENV = LOCPATH=$(common-objpfx)/localedata
-tst_iswprint-ENV = LOCPATH=$(common-objpfx)/localedata
-tst_iswpunct-ENV = LOCPATH=$(common-objpfx)/localedata
-tst_iswspace-ENV = LOCPATH=$(common-objpfx)/localedata
-tst_iswupper-ENV = LOCPATH=$(common-objpfx)/localedata
-tst_iswxdigit-ENV = LOCPATH=$(common-objpfx)/localedata
-tst_swscanf-ENV = LOCPATH=$(common-objpfx)/localedata
-tst_towctrans-ENV = LOCPATH=$(common-objpfx)/localedata
-tst_towlower-ENV = LOCPATH=$(common-objpfx)/localedata
-tst_towupper-ENV = LOCPATH=$(common-objpfx)/localedata
-tst_wcscat-ENV = LOCPATH=$(common-objpfx)/localedata
-tst_wcschr-ENV = LOCPATH=$(common-objpfx)/localedata
-tst_wcscmp-ENV = LOCPATH=$(common-objpfx)/localedata
-tst_wcscoll-ENV = LOCPATH=$(common-objpfx)/localedata
-tst_wcscpy-ENV = LOCPATH=$(common-objpfx)/localedata
-tst_wcscspn-ENV = LOCPATH=$(common-objpfx)/localedata
-tst_wcslen-ENV = LOCPATH=$(common-objpfx)/localedata
-tst_wcsncat-ENV = LOCPATH=$(common-objpfx)/localedata
-tst_wcsncmp-ENV = LOCPATH=$(common-objpfx)/localedata
-tst_wcsncpy-ENV = LOCPATH=$(common-objpfx)/localedata
-tst_wcspbrk-ENV = LOCPATH=$(common-objpfx)/localedata
-tst_wcsspn-ENV = LOCPATH=$(common-objpfx)/localedata
-tst_wcsstr-ENV = LOCPATH=$(common-objpfx)/localedata
-tst_wcswidth-ENV = LOCPATH=$(common-objpfx)/localedata
-tst_wcsxfrm-ENV = LOCPATH=$(common-objpfx)/localedata
-tst_wctob-ENV = LOCPATH=$(common-objpfx)/localedata
-tst_wctrans-ENV = LOCPATH=$(common-objpfx)/localedata
-tst_wctype-ENV = LOCPATH=$(common-objpfx)/localedata
-tst_wcwidth-ENV = LOCPATH=$(common-objpfx)/localedata
+TEST_MBWC_ENV:= LOCPATH=$(common-objpfx)/localedata
+tst_iswalnum-ENV = $(TEST_MBWC_ENV)
+tst_iswalpha-ENV = $(TEST_MBWC_ENV)
+tst_iswcntrl-ENV = $(TEST_MBWC_ENV)
+tst_iswctype-ENV = $(TEST_MBWC_ENV)
+tst_iswdigit-ENV = $(TEST_MBWC_ENV)
+tst_iswgraph-ENV = $(TEST_MBWC_ENV)
+tst_iswlower-ENV = $(TEST_MBWC_ENV)
+tst_iswprint-ENV = $(TEST_MBWC_ENV)
+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_swscanf-ENV = $(TEST_MBWC_ENV)
+tst_towctrans-ENV = $(TEST_MBWC_ENV)
+tst_towlower-ENV = $(TEST_MBWC_ENV)
+tst_towupper-ENV = $(TEST_MBWC_ENV)
+tst_wcscat-ENV = $(TEST_MBWC_ENV)
+tst_wcschr-ENV = $(TEST_MBWC_ENV)
+tst_wcscmp-ENV = $(TEST_MBWC_ENV)
+tst_wcscoll-ENV = $(TEST_MBWC_ENV)
+tst_wcscpy-ENV = $(TEST_MBWC_ENV)
+tst_wcscspn-ENV = $(TEST_MBWC_ENV)
+tst_wcslen-ENV = $(TEST_MBWC_ENV)
+tst_wcsncat-ENV = $(TEST_MBWC_ENV)
+tst_wcsncmp-ENV = $(TEST_MBWC_ENV)
+tst_wcsncpy-ENV = $(TEST_MBWC_ENV)
+tst_wcspbrk-ENV = $(TEST_MBWC_ENV)
+tst_wcsspn-ENV = $(TEST_MBWC_ENV)
+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_wctrans-ENV = $(TEST_MBWC_ENV)
+tst_wctype-ENV = $(TEST_MBWC_ENV)
+tst_wcwidth-ENV = $(TEST_MBWC_ENV)