Re: Use $(run-program-prefix) in more shell script tests

["H.J. Lu" <hjl dot tools at gmail dot com>]

On Wed, Oct 24, 2012 at 4:01 AM, H.J. Lu <hjl.tools@gmail.com> wrote:
> On Sun, Oct 21, 2012 at 3:36 PM, Joseph S. Myers
> <joseph@codesourcery.com> wrote:
>> On Fri, 19 Oct 2012, H.J. Lu wrote:
>>
>>> Testing ASCIItst-table.sh:63: no such file or directory:
>>> /export/build/gnu/glibc/build-x86_64-linux/elf/ld-linux-x86-64.so.2
>>> --library-path /export/build/gnu/glibc/build-x86_64-linux:/export/build/gnu/glibc/build-x86_64-linux/math:/export/build/gnu/glibc/build-x86_64-linux/elf:/export/build/gnu/glibc/build-x86_64-linux/dlfcn:/export/build/gnu/glibc/build-x86_64-linux/nss:/export/build/gnu/glibc/build-x86_64-linux/nis:/export/build/gnu/glibc/build-x86_64-linux/rt:/export/build/gnu/glibc/build-x86_64-linux/resolv:/export/build/gnu/glibc/build-x86_64-linux/crypt:/export/build/gnu/glibc/build-x86_64-linux/nptl
>>
>> I don't see this.  Can you identify exactly how tst-tables.sh is calling
>> tst-table.sh, and exactly what command tst-table.sh is trying to run that
>> produces this error?
>>
>
> I have
>
> [hjl@gnu-tools-1 tmp]$ echo $SHELL
> /bin/zsh
> [hjl@gnu-tools-1 tmp]$
>
> Should we set SHELL in config.make?
>
> --
> H.J.

There is no need to use ${SHELL} since there is "#! /bin/sh".
Tested on x86-64.  OK to install?

Thanks.

	*  iconvdata/tst-table.sh: Remove ${SHELL}.
	*  iconvdata/tst-tables.sh: Likewise.
-- 
H.J.
---
diff --git a/iconvdata/tst-table.sh b/iconvdata/tst-table.sh
index 14ab196..5283ad5 100755
--- a/iconvdata/tst-table.sh
+++ b/iconvdata/tst-table.sh
@@ -35,7 +35,7 @@ export LC_ALL
 set -e

 # Get the charmap.
-${SHELL} tst-table-charmap.sh ${charmap:-$charset} \
+./tst-table-charmap.sh ${charmap:-$charset} \
   < ../localedata/charmaps/${charmap:-$charset} \
   > ${objpfx}tst-${charset}.charmap.table
 # When the charset is GB18030, truncate this table because for this encoding,
diff --git a/iconvdata/tst-tables.sh b/iconvdata/tst-tables.sh
index eaf84dc..77d9d18 100755
--- a/iconvdata/tst-tables.sh
+++ b/iconvdata/tst-tables.sh
@@ -262,7 +262,7 @@ 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} "${run_program_prefix}" \
+  if ./tst-table.sh ${common_objpfx} ${objpfx} "${run_program_prefix}" \
       ${charset} ${charmap} < /dev/null; then
     echo 1>&2
   else