summaryrefslogtreecommitdiff
path: root/tests/multiboot
diff options
context:
space:
mode:
authorEric Blake <eblake@redhat.com>2017-07-03 13:09:50 -0500
committerMax Reitz <mreitz@redhat.com>2017-07-11 17:45:00 +0200
commitb43671f80cda8d0f11dcb929ed76fbd680c29cec (patch)
treee3828c333d14ebf29aecf05a4229e03be43e38b6 /tests/multiboot
parent6f55dfa4a418041033f6457e4635dc3cefe10cf7 (diff)
downloadqemu-b43671f80cda8d0f11dcb929ed76fbd680c29cec.zip
tests: Avoid non-portable 'echo -ARG'
POSIX says that backslashes in the arguments to 'echo', as well as any use of 'echo -n' and 'echo -e', are non-portable; it recommends people should favor 'printf' instead. This is definitely true where we do not control which shell is running (such as in makefile snippets or in documentation examples). But even for scripts where we require bash (and therefore, where echo does what we want by default), it is still possible to use 'shopt -s xpg_echo' to change bash's behavior of echo. And setting a good example never hurts when we are not sure if a snippet will be copied from a bash-only script to a general shell script (although I don't change the use of non-portable \e for ESC when we know the running shell is bash). Replace 'echo -n "..."' with 'printf %s "..."', and 'echo -e "..."' with 'printf %b "...\n"', with the optimization that the %s/%b argument can be omitted if the string being printed is a strict literal with no '%', '$', or '`' (we could technically also make this optimization when there are $ or `` substitutions but where we can prove their results will not be problematic, but proving that such substitutions are safe makes the patch less trivial compared to just being consistent). In the qemu-iotests check script, fix unusual shell quoting that would result in word-splitting if 'date' outputs a space. In test 051, take an opportunity to shorten the line. In test 068, get rid of a pointless second invocation of bash. CC: qemu-trivial@nongnu.org Signed-off-by: Eric Blake <eblake@redhat.com> Message-id: 20170703180950.9895-1-eblake@redhat.com Signed-off-by: Max Reitz <mreitz@redhat.com>
Diffstat (limited to 'tests/multiboot')
-rwxr-xr-xtests/multiboot/run_test.sh10
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/multiboot/run_test.sh b/tests/multiboot/run_test.sh
index 78d7edfc3b..c8f3da8f37 100755
--- a/tests/multiboot/run_test.sh
+++ b/tests/multiboot/run_test.sh
@@ -26,7 +26,7 @@ run_qemu() {
local kernel=$1
shift
- echo -e "\n\n=== Running test case: $kernel $@ ===\n" >> test.log
+ printf %b "\n\n=== Running test case: $kernel $@ ===\n\n" >> test.log
$QEMU \
-kernel $kernel \
@@ -68,21 +68,21 @@ for t in mmap modules; do
pass=1
if [ $debugexit != 1 ]; then
- echo -e "\e[31m ?? \e[0m $t (no debugexit used, exit code $ret)"
+ printf %b "\e[31m ?? \e[0m $t (no debugexit used, exit code $ret)\n"
pass=0
elif [ $ret != 0 ]; then
- echo -e "\e[31mFAIL\e[0m $t (exit code $ret)"
+ printf %b "\e[31mFAIL\e[0m $t (exit code $ret)\n"
pass=0
fi
if ! diff $t.out test.log > /dev/null 2>&1; then
- echo -e "\e[31mFAIL\e[0m $t (output difference)"
+ printf %b "\e[31mFAIL\e[0m $t (output difference)\n"
diff -u $t.out test.log
pass=0
fi
if [ $pass == 1 ]; then
- echo -e "\e[32mPASS\e[0m $t"
+ printf %b "\e[32mPASS\e[0m $t\n"
fi
done