* testsuite/config-guess.sh (run_config_guess): Simplify.

* testsuite/config-sub.sh (run_config_sub): Likewise.
This commit is contained in:
Ben Elliston 2017-10-26 23:10:46 +11:00
parent d07fa31c34
commit 4e26019d10
3 changed files with 9 additions and 4 deletions

View File

@ -1,3 +1,8 @@
2017-10-26 Ben Elliston <bje@gnu.org>
* testsuite/config-guess.sh (run_config_guess): Simplify.
* testsuite/config-sub.sh (run_config_sub): Likewise.
2017-10-26 Ben Elliston <bje@gnu.org> 2017-10-26 Ben Elliston <bje@gnu.org>
* testsuite/config-guess.sh: Fix issues identified by Shellcheck. * testsuite/config-guess.sh: Fix issues identified by Shellcheck.

View File

@ -10,7 +10,7 @@
verbose=false verbose=false
PATH=$(pwd):$PATH PATH=$(pwd):$PATH
run_config_guess () run_config_guess()
{ {
rc=0 rc=0
while read machine release system version processor triplet ; do while read machine release system version processor triplet ; do
@ -29,7 +29,7 @@ run_config_guess ()
[ \$1 = -p ] && echo "@PROCESSOR@" && exit 0 [ \$1 = -p ] && echo "@PROCESSOR@" && exit 0
EOF EOF
chmod +x uname chmod +x uname
output=$(sh ../config.guess 2>/dev/null) output=$(../config.guess 2>/dev/null)
if test $? != 0 ; then if test $? != 0 ; then
echo "FAIL: unable to guess $machine:$release:$system:$version" echo "FAIL: unable to guess $machine:$release:$system:$version"
rc=1 rc=1

View File

@ -9,11 +9,11 @@
verbose=false verbose=false
run_config_sub () run_config_sub()
{ {
rc=0 rc=0
while read -r alias canonical ; do while read -r alias canonical ; do
output=$(sh ../config.sub "$alias") output=$(../config.sub "$alias")
if test "$output" != "$canonical" ; then if test "$output" != "$canonical" ; then
echo "FAIL: $alias -> $output, but expected $canonical" echo "FAIL: $alias -> $output, but expected $canonical"
rc=1 rc=1