Update test-gencat.sh and tst-langinfo.sh

diff --git a/ChangeLog b/ChangeLog
index 4d0407d..a69c627 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-11-01  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * catgets/test-gencat.sh (run_program_prefix): Renamed to ...
+       (run_program_cmd): This.
+       * localedata/tst-langinfo.sh (run_program_prefix): Removed.
+       (tst_langinfo): New variable.  Use it.
+
 2012-11-01  Sebastan Andrzej Siewior  <bigeasy@linutronix.de>
 
        * sysdeps/powerpc/powerpc32/dl-trampoline.S: Put __NO_FPRS__ around

diff --git a/catgets/test-gencat.sh b/catgets/test-gencat.sh
index c884b8f..8557a3f 100755 (executable)
--- a/catgets/test-gencat.sh
+++ b/catgets/test-gencat.sh
@@ -20,12 +20,12 @@
 set -e
 
 common_objpfx=$1
-run_program_prefix=$2
+run_program_cmd=$2
 
 # Run the test program.
 LOCPATH=${common_objpfx}localedata GCONV_PATH=${common_objpfx}iconvdata \
 NLSPATH=${common_objpfx}catgets/%N.%c.cat LC_ALL=ja_JP.SJIS \
-  ${run_program_prefix} \
+  ${run_program_cmd} \
     > ${common_objpfx}catgets/test-gencat.out
 
 # Compare with the expected result.

diff --git a/localedata/tst-langinfo.sh b/localedata/tst-langinfo.sh
index 04771cb..8d46717 100755 (executable)
--- a/localedata/tst-langinfo.sh
+++ b/localedata/tst-langinfo.sh
@@ -20,7 +20,7 @@
 set -e
 
 common_objpfx=$1
-run_program_prefix=$2
+tst_langinfo=$2
 
 # Run the test program.
 cat <<"EOF" |
@@ -340,8 +340,7 @@ ja_JP.EUC-JP         NOEXPR      ^([nN
 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 \
+LC_ALL=tt_TT ${tst_langinfo} \
     > ${common_objpfx}localedata/tst-langinfo.out
 
 exit $?