This is the mail archive of the libc-alpha@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Clean up localedata/tst-wctype.sh to match how it is called


localedata/Makefile passes $(built-program-cmd) - the full command to
run a test program - to tst-wctype.sh.  tst-wctype.sh then acts as if
what was passed was $(run-program-prefix) - using a variable with name
run_program_prefix, and passing the name of the tst-wctype binary to
it (so tst-wctype - which ignores its command-line arguments - is
called with its own name as an argument).

This patch (extracted from the cross-testing changes, though not
strictly required for cross-testing) cleans up the script to reflect
how the makefile actually calls it.  Tested x86_64.

2012-10-18  Jim Blandy  <jimb@codesourcery.com>
	    Joseph Myers  <joseph@codesourcery.com>

	* localedata/tst-wctype.sh (run_program_prefix): Remove variable.
	(tst_wctype): New variable.  Use it directly to run test program
	instead of passing test program name as argument.

diff --git a/localedata/tst-wctype.sh b/localedata/tst-wctype.sh
index 0dd8a82..8cb34b8 100755
--- a/localedata/tst-wctype.sh
+++ b/localedata/tst-wctype.sh
@@ -20,12 +20,11 @@
 set -e
 
 common_objpfx=$1
-run_program_prefix=$2
+tst_wctype=$2
 
 # Run the test program.
 LOCPATH=${common_objpfx}localedata GCONV_PATH=${common_objpfx}iconvdata \
-LC_ALL=ja_JP.EUC-JP ${run_program_prefix} \
-  ${common_objpfx}localedata/tst-wctype < tst-wctype.input \
+LC_ALL=ja_JP.EUC-JP ${tst_wctype} < tst-wctype.input \
     > ${common_objpfx}localedata/tst-wctype.out
 
 exit $?

-- 
Joseph S. Myers
joseph@codesourcery.com


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]