diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2012-10-19 23:30:43 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2012-10-19 23:30:43 +0000 |
| commit | e40a0d2113bfeb5018409ed25e9711e6da7d994b (patch) | |
| tree | 49719c577bd5d3ba4da545a4a184a6a5326eee8d /iconvdata | |
| parent | 728e272aec1b217bce32f1d75ecefb888e67b678 (diff) | |
| download | glibc-e40a0d2113bfeb5018409ed25e9711e6da7d994b.zip glibc-e40a0d2113bfeb5018409ed25e9711e6da7d994b.tar.gz glibc-e40a0d2113bfeb5018409ed25e9711e6da7d994b.tar.bz2 | |
Use $(run-program-prefix) in more shell script tests.
Diffstat (limited to 'iconvdata')
| -rw-r--r-- | iconvdata/Makefile | 3 | ||||
| -rwxr-xr-x | iconvdata/tst-table.sh | 11 | ||||
| -rwxr-xr-x | iconvdata/tst-tables.sh | 6 |
3 files changed, 12 insertions, 8 deletions
diff --git a/iconvdata/Makefile b/iconvdata/Makefile index 2ddcae5..cf6cf70 100644 --- a/iconvdata/Makefile +++ b/iconvdata/Makefile @@ -304,7 +304,8 @@ $(objpfx)iconv-test.out: run-iconv-test.sh $(objpfx)gconv-modules \ $(objpfx)tst-tables.out: tst-tables.sh $(objpfx)gconv-modules \ $(addprefix $(objpfx),$(modules.so)) \ $(objpfx)tst-table-from $(objpfx)tst-table-to - $(SHELL) $< $(common-objpfx) $(common-objpfx)iconvdata/ > $@ + $(SHELL) $< $(common-objpfx) $(common-objpfx)iconvdata/ \ + '$(run-program-prefix)' > $@ do-tests-clean common-mostlyclean: tst-tables-clean diff --git a/iconvdata/tst-table.sh b/iconvdata/tst-table.sh index 05f7c6f..14ab196 100755 --- a/iconvdata/tst-table.sh +++ b/iconvdata/tst-table.sh @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc. +# Copyright (C) 2000-2012 Free Software Foundation, Inc. # This file is part of the GNU C Library. # Contributed by Bruno Haible <haible@clisp.cons.org>, 2000. # @@ -23,8 +23,9 @@ common_objpfx=$1 objpfx=$2 -charset=$3 -charmap=$4 +run_program_prefix=$3 +charset=$4 +charmap=$5 GCONV_PATH=${common_objpfx}iconvdata export GCONV_PATH @@ -59,12 +60,12 @@ else fi # iconv in one direction. -${common_objpfx}elf/ld.so --library-path $common_objpfx \ +${run_program_prefix} \ ${objpfx}tst-table-from ${charset} \ > ${objpfx}tst-${charset}.table # iconv in the other direction. -${common_objpfx}elf/ld.so --library-path $common_objpfx \ +${run_program_prefix} \ ${objpfx}tst-table-to ${charset} | sort \ > ${objpfx}tst-${charset}.inverse.table diff --git a/iconvdata/tst-tables.sh b/iconvdata/tst-tables.sh index b66d484..f65b72d 100755 --- a/iconvdata/tst-tables.sh +++ b/iconvdata/tst-tables.sh @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2000-2004,2007,2011 Free Software Foundation, Inc. +# Copyright (C) 2000-2012 Free Software Foundation, Inc. # This file is part of the GNU C Library. # Contributed by Bruno Haible <haible@clisp.cons.org>, 2000. # @@ -23,6 +23,7 @@ common_objpfx=$1 objpfx=$2 +run_program_prefix=$3 status=0 @@ -261,7 +262,8 @@ while read charset charmap; do if test "$charset" = GB18030; then echo "This might take a while" 1>&2; fi case ${charset} in \#*) continue;; esac echo -n "Testing ${charset}" 1>&2 - if ${SHELL} tst-table.sh ${common_objpfx} ${objpfx} ${charset} ${charmap}; then + if ${SHELL} tst-table.sh ${common_objpfx} ${objpfx} "${run_program_prefix}" \ + ${charset} ${charmap}; then echo 1>&2 else echo "failed: ./tst-table.sh ${common_objpfx} ${objpfx} ${charset} ${charmap}" |