Merge changes between r21108 and r21352 from /fsf/trunk.

git-svn-id: svn://svn.eglibc.org/trunk@21353 7b3dc134-2b1b-0410-93df-9e9f96275f8d

4 files changed, 18 insertions, 21 deletions

diff --git a/libc/intl/Makefile b/libc/intl/Makefile
index c408120eb..2d4ae1b98 100644
--- a/libc/intl/Makefile
+++ b/libc/intl/Makefile
@@ -49,7 +49,7 @@ $(objpfx)plural.o: plural.c
 
 include ../Rules
 
-# eglibc: ifeq (no,$(cross-compiling))
+ifeq ($(run-built-tests),yes)
 ifeq (yyyes,$(OPTION_EGLIBC_LOCALES)$(OPTION_EGLIBC_LOCALE_CODE)$(build-shared))
 ifneq ($(strip $(MSGFMT)),:)
 tests: $(objpfx)tst-translit.out $(objpfx)tst-gettext2.out \
@@ -75,14 +75,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 '$(cross-test-wrapper)'
+	$(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/ \
-	'$(cross-test-wrapper)'
+	$(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/ \
-	'$(cross-test-wrapper)'
+	$(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
@@ -92,7 +92,7 @@ $(objpfx)tst-codeset.out: $(codeset_mo)
 $(objpfx)tst-gettext3.out: $(codeset_mo)
 $(objpfx)tst-gettext5.out: $(codeset_mo)
 endif
-# eglibc: endif
+endif
 
 $(objpfx)msgs.h: po2test.awk ../po/de.po
 	$(make-target-directory)
diff --git a/libc/intl/tst-gettext.sh b/libc/intl/tst-gettext.sh
index fd36191d3..a3bb0a61d 100755
--- a/libc/intl/tst-gettext.sh
+++ b/libc/intl/tst-gettext.sh
@@ -20,9 +20,9 @@
 set -e
 
 common_objpfx=$1
-objpfx=$2
-malloc_trace=$3
-cross_test_wrapper=$4
+run_program_prefix=$2
+objpfx=$3
+malloc_trace=$4
 
 LC_ALL=C
 export LC_ALL
@@ -54,8 +54,7 @@ export LOCPATH
 
 # Now run the test.
 MALLOC_TRACE=$malloc_trace LOCPATH=${objpfx}localedir:$LOCPATH \
-${cross_test_wrapper} \
-${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/libc/intl/tst-gettext2.sh b/libc/intl/tst-gettext2.sh
index b6f439daf..833b97986 100644
--- a/libc/intl/tst-gettext2.sh
+++ b/libc/intl/tst-gettext2.sh
@@ -20,8 +20,8 @@
 set -e
 
 common_objpfx=$1
-objpfx=$2
-cross_test_wrapper=$3
+run_program_prefix=$2
+objpfx=$3
 
 LC_ALL=C
 export LC_ALL
@@ -67,8 +67,7 @@ LOCPATH=${objpfx}domaindir
 export LOCPATH
 
 # Now run the test.
-${cross_test_wrapper} \
-${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/libc/intl/tst-translit.sh b/libc/intl/tst-translit.sh
index ba88928a6..27cd1bf95 100755
--- a/libc/intl/tst-translit.sh
+++ b/libc/intl/tst-translit.sh
@@ -20,8 +20,8 @@
 set -e
 
 common_objpfx=$1
-objpfx=$2
-cross_test_wrapper=$3
+run_program_prefix=$2
+objpfx=$3
 
 LC_ALL=C
 export LC_ALL
@@ -37,8 +37,7 @@ export GCONV_PATH
 LOCPATH=${common_objpfx}localedata
 export LOCPATH
 
-${cross_test_wrapper} \
-${common_objpfx}elf/ld.so --library-path $common_objpfx \
+${run_program_prefix} \
 ${objpfx}tst-translit > ${objpfx}tst-translit.out ${objpfx}domaindir
 
 exit $?