From 5a1abdc6448184ae853dec84bb22f97237588e21 Mon Sep 17 00:00:00 2001 Message-Id: From: John Ericson Date: Sun, 29 Jul 2018 22:12:56 -0400 Subject: [PATCH 1/3] * testsuite/config-*.sh: Reindent with tabs To: address@hidden --- ChangeLog | 4 +++ testsuite/config-guess.sh | 54 +++++++++++++++++++-------------------- testsuite/config-sub.sh | 28 ++++++++++---------- 3 files changed, 45 insertions(+), 41 deletions(-) diff --git a/ChangeLog b/ChangeLog index f606e2d..1acd48d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2018-07-30 John Ericson + + * testsuite/config-*.sh: Reindent with tabs + 2018-07-30 Ben Elliston * Makefile (check-guess, check-sub): Run tests under bash. diff --git a/testsuite/config-guess.sh b/testsuite/config-guess.sh index d59d28e..0648c81 100644 --- a/testsuite/config-guess.sh +++ b/testsuite/config-guess.sh @@ -13,14 +13,14 @@ PATH=$(pwd):$PATH run_config_guess() { - rc=0 - while IFS='|' read -r machine release system version processor triplet ; do - sed \ - -e "s,@MACHINE@,$machine," \ - -e "s,@RELEASE@,$release," \ - -e "s,@SYSTEM@,$system," \ - -e "s,@VERSION@,$version," \ - -e "s,@PROCESSOR@,$processor," > uname << EOF + rc=0 + while IFS='|' read -r machine release system version processor triplet ; do + sed \ + -e "s,@MACHINE@,$machine," \ + -e "s,@RELEASE@,$release," \ + -e "s,@SYSTEM@,$system," \ + -e "s,@VERSION@,$version," \ + -e "s,@PROCESSOR@,$processor," > uname << EOF #!/bin/sh [ \$# -ne 1 ] && exec sh \$0 -s [ \$1 = -m ] && echo "@MACHINE@" && exit 0 @@ -29,29 +29,29 @@ run_config_guess() [ \$1 = -v ] && echo "@VERSION@" && exit 0 [ \$1 = -p ] && echo "@PROCESSOR@" && exit 0 EOF - chmod +x uname - output=$(sh -eu ../config.guess 2>/dev/null) - if test $? != 0 ; then - echo "FAIL: unable to guess $machine:$release:$system:$version" - rc=1 - continue - fi - if test "$output" != "$triplet" ; then - echo "FAIL: $output (expected $triplet)" - rc=1 - continue - fi - $verbose && echo "PASS: $triplet" - done - return $rc + chmod +x uname + output=$(sh -eu ../config.guess 2>/dev/null) + if test $? != 0 ; then + echo "FAIL: unable to guess $machine:$release:$system:$version" + rc=1 + continue + fi + if test "$output" != "$triplet" ; then + echo "FAIL: $output (expected $triplet)" + rc=1 + continue + fi + $verbose && echo "PASS: $triplet" + done + return $rc } if sed 's, | ,|,g' < config-guess.data | run_config_guess ; then - numtests=$(wc -l config-guess.data | cut -d' ' -f1) - $verbose || echo "PASS: config.guess checks ($numtests tests)" + numtests=$(wc -l config-guess.data | cut -d' ' -f1) + $verbose || echo "PASS: config.guess checks ($numtests tests)" else - echo "Unexpected failures." - exit 1 + echo "Unexpected failures." + exit 1 fi exit 0 diff --git a/testsuite/config-sub.sh b/testsuite/config-sub.sh index c5b09f6..0b1d232 100644 --- a/testsuite/config-sub.sh +++ b/testsuite/config-sub.sh @@ -13,24 +13,24 @@ verbose=false run_config_sub() { - rc=0 - while read -r alias canonical ; do - output=$(sh -eu ../config.sub "$alias") - if test "$output" != "$canonical" ; then - echo "FAIL: $alias -> $output, but expected $canonical" - rc=1 - else - $verbose && echo "PASS: $alias" - fi - done < config-sub.data - return $rc + rc=0 + while read -r alias canonical ; do + output=$(sh -eu ../config.sub "$alias") + if test "$output" != "$canonical" ; then + echo "FAIL: $alias -> $output, but expected $canonical" + rc=1 + else + $verbose && echo "PASS: $alias" + fi + done < config-sub.data + return $rc } if run_config_sub ; then - numtests=$(wc -l config-sub.data | cut -d' ' -f1) - $verbose || echo "PASS: config.sub checks ($numtests tests)" + numtests=$(wc -l config-sub.data | cut -d' ' -f1) + $verbose || echo "PASS: config.sub checks ($numtests tests)" else - exit 1 + exit 1 fi exit 0 -- 2.17.1