aboutsummaryrefslogtreecommitdiff
path: root/iconvdata
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2012-10-19 23:30:43 +0000
committerJoseph Myers <joseph@codesourcery.com>2012-10-19 23:30:43 +0000
commite40a0d2113bfeb5018409ed25e9711e6da7d994b (patch)
tree49719c577bd5d3ba4da545a4a184a6a5326eee8d /iconvdata
parent728e272aec1b217bce32f1d75ecefb888e67b678 (diff)
downloadglibc-e40a0d2113bfeb5018409ed25e9711e6da7d994b.tar
glibc-e40a0d2113bfeb5018409ed25e9711e6da7d994b.tar.gz
glibc-e40a0d2113bfeb5018409ed25e9711e6da7d994b.tar.bz2
glibc-e40a0d2113bfeb5018409ed25e9711e6da7d994b.zip
Use $(run-program-prefix) in more shell script tests.
Diffstat (limited to 'iconvdata')
-rw-r--r--iconvdata/Makefile3
-rwxr-xr-xiconvdata/tst-table.sh11
-rwxr-xr-xiconvdata/tst-tables.sh6
3 files changed, 12 insertions, 8 deletions
diff --git a/iconvdata/Makefile b/iconvdata/Makefile
index 2ddcae5040..cf6cf707fe 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 05f7c6f175..14ab196d83 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 b66d484d13..f65b72d6fa 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}"