Update to 2.17

[platform/upstream/glibc.git] / localedata / tst-langinfo.sh

diff --git a/localedata/tst-langinfo.sh b/localedata/tst-langinfo.sh
index 04771cb..5f639e6 100755 (executable)
--- a/localedata/tst-langinfo.sh
+++ b/localedata/tst-langinfo.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Test nl_langinfo.
-# Copyright (C) 2000-2012 Free Software Foundation, Inc.
+# Copyright (C) 2000-2015 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 
 # The GNU C Library is free software; you can redistribute it and/or
@@ -20,7 +20,9 @@
 set -e
 
 common_objpfx=$1
-run_program_prefix=$2
+tst_langinfo_before_env=$2
+run_program_env=$3
+tst_langinfo_after_env=$4
 
 # Run the test program.
 cat <<"EOF" |
@@ -339,9 +341,8 @@ ja_JP.EUC-JP         NOEXPR      ^([nN
 # ja_JP.EUC-JP         CRNCYSTR    JPY
 ja_JP.EUC-JP         CODESET     EUC-JP
 EOF
-LOCPATH=${common_objpfx}localedata GCONV_PATH=${common_objpfx}iconvdata \
-LC_ALL=tt_TT ${run_program_prefix} \
-  ${common_objpfx}localedata/tst-langinfo \
-    > ${common_objpfx}localedata/tst-langinfo.out
+${tst_langinfo_before_env} \
+${run_program_env} \
+LC_ALL=tt_TT ${tst_langinfo_after_env}
 
 exit $?