about summary refs log tree commit diff
path: root/intl
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 /intl
parent728e272aec1b217bce32f1d75ecefb888e67b678 (diff)
downloadglibc-e40a0d2113bfeb5018409ed25e9711e6da7d994b.tar.gz
glibc-e40a0d2113bfeb5018409ed25e9711e6da7d994b.tar.xz
glibc-e40a0d2113bfeb5018409ed25e9711e6da7d994b.zip
Use $(run-program-prefix) in more shell script tests.
Diffstat (limited to 'intl')
-rw-r--r--intl/Makefile10
-rwxr-xr-xintl/tst-gettext.sh7
-rw-r--r--intl/tst-gettext2.sh5
-rwxr-xr-xintl/tst-translit.sh5
4 files changed, 16 insertions, 11 deletions
diff --git a/intl/Makefile b/intl/Makefile
index 764badcab1..5bf66065da 100644
--- a/intl/Makefile
+++ b/intl/Makefile
@@ -74,12 +74,14 @@ $(codeset_mo): tstcodeset.po
 $(objpfx)mtrace-tst-gettext: $(objpfx)tst-gettext.out
 	$(common-objpfx)malloc/mtrace $(objpfx)tst-gettext.mtrace > $@
 $(objpfx)tst-gettext.out: tst-gettext.sh $(objpfx)tst-gettext
-	$(SHELL) $< $(common-objpfx) $(common-objpfx)intl/ \
-	  $(objpfx)tst-gettext.mtrace
+	$(SHELL) $< $(common-objpfx) '$(run-program-prefix)' \
+	  $(common-objpfx)intl/ $(objpfx)tst-gettext.mtrace
 $(objpfx)tst-translit.out: tst-translit.sh $(objpfx)tst-translit
-	$(SHELL) $< $(common-objpfx) $(common-objpfx)intl/
+	$(SHELL) $< $(common-objpfx) '$(run-program-prefix)' \
+	  $(common-objpfx)intl/
 $(objpfx)tst-gettext2.out: tst-gettext2.sh $(objpfx)tst-gettext2
-	$(SHELL) $< $(common-objpfx) $(common-objpfx)intl/
+	$(SHELL) $< $(common-objpfx) '$(run-program-prefix)' \
+	  $(common-objpfx)intl/
 $(objpfx)tst-gettext4.out: tst-gettext4.sh $(objpfx)tst-gettext4
 	$(SHELL) $< $(common-objpfx) '$(run-program-prefix)' $(common-objpfx)intl/
 $(objpfx)tst-gettext6.out: tst-gettext6.sh $(objpfx)tst-gettext6
diff --git a/intl/tst-gettext.sh b/intl/tst-gettext.sh
index a3ac377987..a3bb0a61d7 100755
--- a/intl/tst-gettext.sh
+++ b/intl/tst-gettext.sh
@@ -20,8 +20,9 @@
 set -e
 
 common_objpfx=$1
-objpfx=$2
-malloc_trace=$3
+run_program_prefix=$2
+objpfx=$3
+malloc_trace=$4
 
 LC_ALL=C
 export LC_ALL
@@ -53,7 +54,7 @@ export LOCPATH
 
 # Now run the test.
 MALLOC_TRACE=$malloc_trace LOCPATH=${objpfx}localedir:$LOCPATH \
-${common_objpfx}elf/ld.so --library-path $common_objpfx \
+${run_program_prefix} \
 ${objpfx}tst-gettext > ${objpfx}tst-gettext.out ${objpfx}domaindir
 
 exit $?
diff --git a/intl/tst-gettext2.sh b/intl/tst-gettext2.sh
index 2d9c52fef9..833b97986c 100644
--- a/intl/tst-gettext2.sh
+++ b/intl/tst-gettext2.sh
@@ -20,7 +20,8 @@
 set -e
 
 common_objpfx=$1
-objpfx=$2
+run_program_prefix=$2
+objpfx=$3
 
 LC_ALL=C
 export LC_ALL
@@ -66,7 +67,7 @@ LOCPATH=${objpfx}domaindir
 export LOCPATH
 
 # Now run the test.
-${common_objpfx}elf/ld.so --library-path $common_objpfx \
+${run_program_prefix} \
 ${objpfx}tst-gettext2 > ${objpfx}tst-gettext2.out ${objpfx}domaindir &&
 cmp ${objpfx}tst-gettext2.out - <<EOF
 String1 - Lang1: 1st string
diff --git a/intl/tst-translit.sh b/intl/tst-translit.sh
index 93159c7cef..27cd1bf95d 100755
--- a/intl/tst-translit.sh
+++ b/intl/tst-translit.sh
@@ -20,7 +20,8 @@
 set -e
 
 common_objpfx=$1
-objpfx=$2
+run_program_prefix=$2
+objpfx=$3
 
 LC_ALL=C
 export LC_ALL
@@ -36,7 +37,7 @@ export GCONV_PATH
 LOCPATH=${common_objpfx}localedata
 export LOCPATH
 
-${common_objpfx}elf/ld.so --library-path $common_objpfx \
+${run_program_prefix} \
 ${objpfx}tst-translit > ${objpfx}tst-translit.out ${objpfx}domaindir
 
 exit $?