From 4e26019d10c99283e9410563cf61c795ad7fa32b Mon Sep 17 00:00:00 2001 From: Ben Elliston Date: Thu, 26 Oct 2017 23:10:46 +1100 Subject: [PATCH] * testsuite/config-guess.sh (run_config_guess): Simplify. * testsuite/config-sub.sh (run_config_sub): Likewise. --- ChangeLog | 5 +++++ testsuite/config-guess.sh | 4 ++-- testsuite/config-sub.sh | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index c2159c1..6ba605a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2017-10-26 Ben Elliston + + * testsuite/config-guess.sh (run_config_guess): Simplify. + * testsuite/config-sub.sh (run_config_sub): Likewise. + 2017-10-26 Ben Elliston * testsuite/config-guess.sh: Fix issues identified by Shellcheck. diff --git a/testsuite/config-guess.sh b/testsuite/config-guess.sh index b3e52ca..a160cf6 100644 --- a/testsuite/config-guess.sh +++ b/testsuite/config-guess.sh @@ -10,7 +10,7 @@ verbose=false PATH=$(pwd):$PATH -run_config_guess () +run_config_guess() { rc=0 while read machine release system version processor triplet ; do @@ -29,7 +29,7 @@ run_config_guess () [ \$1 = -p ] && echo "@PROCESSOR@" && exit 0 EOF chmod +x uname - output=$(sh ../config.guess 2>/dev/null) + output=$(../config.guess 2>/dev/null) if test $? != 0 ; then echo "FAIL: unable to guess $machine:$release:$system:$version" rc=1 diff --git a/testsuite/config-sub.sh b/testsuite/config-sub.sh index a5a910a..d6186ce 100644 --- a/testsuite/config-sub.sh +++ b/testsuite/config-sub.sh @@ -9,11 +9,11 @@ verbose=false -run_config_sub () +run_config_sub() { rc=0 while read -r alias canonical ; do - output=$(sh ../config.sub "$alias") + output=$(../config.sub "$alias") if test "$output" != "$canonical" ; then echo "FAIL: $alias -> $output, but expected $canonical" rc=1