Merge changes between r22176 and r22241 from /fsf/trunk.

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

1 files changed, 11 insertions, 11 deletions

diff --git a/libc/posix/wordexp-tst.sh b/libc/posix/wordexp-tst.sh
index 93b507787..5dff727e3 100755
--- a/libc/posix/wordexp-tst.sh
+++ b/libc/posix/wordexp-tst.sh
@@ -24,7 +24,7 @@ set -e
 # The others are just there to be parameters.
 
 common_objpfx=$1; shift
-run_program_prefix=$1; shift
+test_program_prefix=$1; shift
 logfile=${common_objpfx}posix/wordexp-tst.out
 testout=${common_objpfx}posix/wordexp-test-result
 
@@ -38,7 +38,7 @@ IFS=" 	\
 export IFS
 
 failed=0
-${run_program_prefix} \
+${test_program_prefix} \
 ${common_objpfx}posix/wordexp-test '$*' > ${testout}1
 cat <<"EOF" | cmp - ${testout}1 >> $logfile || failed=1
 wordexp returned 0
@@ -50,7 +50,7 @@ if test $failed -ne 0; then
 fi
 
 failed=0
-${run_program_prefix} \
+${test_program_prefix} \
 ${common_objpfx}posix/wordexp-test '${*}' unquoted > ${testout}2
 cat <<"EOF" | cmp - ${testout}2 >> $logfile || failed=1
 wordexp returned 0
@@ -63,7 +63,7 @@ if test $failed -ne 0; then
 fi
 
 failed=0
-${run_program_prefix} \
+${test_program_prefix} \
 ${common_objpfx}posix/wordexp-test '$@' unquoted > ${testout}3
 cat <<"EOF" | cmp - ${testout}3 >> $logfile || failed=1
 wordexp returned 0
@@ -76,7 +76,7 @@ if test $failed -ne 0; then
 fi
 
 failed=0
-${run_program_prefix} \
+${test_program_prefix} \
 ${common_objpfx}posix/wordexp-test '"$* quoted"' param > ${testout}4
 cat <<"EOF" | cmp - ${testout}4 >> $logfile || failed=1
 wordexp returned 0
@@ -88,7 +88,7 @@ if test $failed -ne 0; then
 fi
 
 failed=0
-${run_program_prefix} \
+${test_program_prefix} \
 ${common_objpfx}posix/wordexp-test '"$@ quoted"' param > ${testout}5
 cat <<"EOF" | cmp - ${testout}5 >> $logfile || failed=1
 wordexp returned 0
@@ -102,7 +102,7 @@ fi
 # Why?  Because bash does it that way..
 
 failed=0
-${run_program_prefix} \
+${test_program_prefix} \
 ${common_objpfx}posix/wordexp-test '$#' 2 3 4 5 > ${testout}6
 cat <<"EOF" | cmp - ${testout}6 >> $logfile || failed=1
 wordexp returned 0
@@ -114,7 +114,7 @@ if test $failed -ne 0; then
 fi
 
 failed=0
-${run_program_prefix} \
+${test_program_prefix} \
 ${common_objpfx}posix/wordexp-test '$2 ${3} $4' 2nd 3rd "4 th" > ${testout}7
 cat <<"EOF" | cmp - ${testout}7 >> $logfile || failed=1
 wordexp returned 0
@@ -129,7 +129,7 @@ if test $failed -ne 0; then
 fi
 
 failed=0
-${run_program_prefix} \
+${test_program_prefix} \
 ${common_objpfx}posix/wordexp-test '${11}' 2 3 4 5 6 7 8 9 10 11 > ${testout}8
 cat <<"EOF" | cmp - ${testout}8 >> $logfile || failed=1
 wordexp returned 0
@@ -141,7 +141,7 @@ if test $failed -ne 0; then
 fi
 
 failed=0
-${run_program_prefix} \
+${test_program_prefix} \
 ${common_objpfx}posix/wordexp-test '"a $@ b"' c d > ${testout}9
 cat <<"EOF" | cmp - ${testout}9 >> $logfile || failed=1
 wordexp returned 0
@@ -154,7 +154,7 @@ if test $failed -ne 0; then
   status=1
 fi
 
-${run_program_prefix} \
+${test_program_prefix} \
 ${common_objpfx}posix/wordexp-test '${#@} ${#2} *$**' two 3 4 > ${testout}10
 cat <<"EOF" | cmp - ${testout}10 || failed=1
 wordexp returned 0