From nobody Sun Apr 28 05:50:22 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1498852785662233.27933571989854; Fri, 30 Jun 2017 12:59:45 -0700 (PDT) Received: from localhost ([::1]:45789 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dR24s-00073t-Dt for importer@patchew.org; Fri, 30 Jun 2017 15:59:42 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41444) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dR23z-0006cD-Lr for qemu-devel@nongnu.org; Fri, 30 Jun 2017 15:58:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dR23x-0005bn-AN for qemu-devel@nongnu.org; Fri, 30 Jun 2017 15:58:47 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48574) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dR23q-0005VS-TU; Fri, 30 Jun 2017 15:58:39 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id DE7A37AE98; Fri, 30 Jun 2017 19:58:37 +0000 (UTC) Received: from red.redhat.com (ovpn-123-78.rdu2.redhat.com [10.10.123.78]) by smtp.corp.redhat.com (Postfix) with ESMTP id D74BB60BE0; Fri, 30 Jun 2017 19:58:33 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com DE7A37AE98 Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=eblake@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com DE7A37AE98 From: Eric Blake To: qemu-devel@nongnu.org Date: Fri, 30 Jun 2017 14:58:31 -0500 Message-Id: <20170630195831.26087-1-eblake@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Fri, 30 Jun 2017 19:58:38 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2] tests: Avoid non-portable 'echo -ARG' X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: edgar.iglesias@xilinx.com, Kevin Wolf , Jiri Pirko , qemu-block@nongnu.org, qemu-trivial@nongnu.org, mreitz@redhat.com, stefanha@redhat.com, "Edgar E. Iglesias" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 contains no substitutions that could result in '%' (trivial if there is no $ or `, but also possible when using things like $ret that are known to be numeric given the assignment to ret just above). 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 Reviewed-by: Jeff Cody --- v2: be robust to potential % in substitutions [Max], rebase to master, shorten some long lines and an odd bash -c use Add qemu-trivial in cc, although we may decide this is better through Max's block tree since it is mostly iotests related --- qemu-options.hx | 4 ++-- tests/multiboot/run_test.sh | 10 +++++----- tests/qemu-iotests/051 | 7 ++++--- tests/qemu-iotests/068 | 2 +- tests/qemu-iotests/142 | 48 ++++++++++++++++++++++-------------------= ---- tests/qemu-iotests/171 | 14 ++++++------- tests/qemu-iotests/check | 18 ++++++++--------- tests/rocker/all | 10 +++++----- tests/tcg/cris/Makefile | 8 ++++---- 9 files changed, 61 insertions(+), 60 deletions(-) diff --git a/qemu-options.hx b/qemu-options.hx index 297bd8a..05a0474 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -4363,7 +4363,7 @@ The simplest (insecure) usage is to provide the secre= t inline The simplest secure usage is to provide the secret via a file - # echo -n "letmein" > mypasswd.txt + # printf "letmein" > mypasswd.txt # $QEMU -object secret,id=3Dsec0,file=3Dmypasswd.txt,format=3Draw For greater security, AES-256-CBC should be used. To illustrate usage, @@ -4391,7 +4391,7 @@ telling openssl to base64 encode the result, but it c= ould be left as raw bytes if desired. @example - # SECRET=3D$(echo -n "letmein" | + # SECRET=3D$(printf "letmein" | openssl enc -aes-256-cbc -a -K $KEY -iv $IV) @end example diff --git a/tests/multiboot/run_test.sh b/tests/multiboot/run_test.sh index 78d7edf..9a1cd59 100755 --- a/tests/multiboot/run_test.sh +++ b/tests/multiboot/run_test.sh @@ -26,7 +26,7 @@ run_qemu() { local kernel=3D$1 shift - echo -e "\n\n=3D=3D=3D Running test case: $kernel $@ =3D=3D=3D\n" >> t= est.log + printf %b "\n\n=3D=3D=3D Running test case: $kernel $@ =3D=3D=3D\n\n" = >> test.log $QEMU \ -kernel $kernel \ @@ -68,21 +68,21 @@ for t in mmap modules; do pass=3D1 if [ $debugexit !=3D 1 ]; then - echo -e "\e[31m ?? \e[0m $t (no debugexit used, exit code $ret)" + printf "\e[31m ?? \e[0m $t (no debugexit used, exit code $ret)\n" pass=3D0 elif [ $ret !=3D 0 ]; then - echo -e "\e[31mFAIL\e[0m $t (exit code $ret)" + printf "\e[31mFAIL\e[0m $t (exit code $ret)\n" pass=3D0 fi if ! diff $t.out test.log > /dev/null 2>&1; then - echo -e "\e[31mFAIL\e[0m $t (output difference)" + printf "\e[31mFAIL\e[0m $t (output difference)\n" diff -u $t.out test.log pass=3D0 fi if [ $pass =3D=3D 1 ]; then - echo -e "\e[32mPASS\e[0m $t" + printf "\e[32mPASS\e[0m $t\n" fi done diff --git a/tests/qemu-iotests/051 b/tests/qemu-iotests/051 index 26c29de..c3c08bf 100755 --- a/tests/qemu-iotests/051 +++ b/tests/qemu-iotests/051 @@ -217,7 +217,7 @@ run_qemu -drive driver=3Dnull-co,cache=3Dinvalid_value # Test 142 checks the direct=3Don cases for cache in writeback writethrough unsafe invalid_value; do - echo -e "info block\ninfo block file\ninfo block backing\ninfo block b= acking-file" | \ + printf "info block %s\n" '' file backing backing-file | \ run_qemu -drive file=3D"$TEST_IMG",cache=3D$cache,backing.file.filenam= e=3D"$TEST_IMG.base",backing.cache.no-flush=3Don,backing.node-name=3Dbackin= g,backing.file.node-name=3Dbacking-file,file.node-name=3Dfile,if=3Dnone,id= =3D$device_id -nodefaults done @@ -325,8 +325,9 @@ echo "qemu-io $device_id \"write -P 0x22 0 4k\"" | run_= qemu -drive file=3D"$TEST_I $QEMU_IO -c "read -P 0x22 0 4k" "$TEST_IMG" | _filter_qemu_io -echo -e "qemu-io $device_id \"write -P 0x33 0 4k\"\ncommit $device_id" | r= un_qemu -drive file=3D"$TEST_IMG",snapshot=3Don,if=3Dnone,id=3D$device_id\ - | _= filter_qemu_io +printf "qemu-io $device_id \"write -P 0x33 0 4k\"\ncommit $device_id\n" | + run_qemu -drive file=3D"$TEST_IMG",snapshot=3Don,if=3Dnone,id=3D$devic= e_id | + _filter_qemu_io $QEMU_IO -c "read -P 0x33 0 4k" "$TEST_IMG" | _filter_qemu_io diff --git a/tests/qemu-iotests/068 b/tests/qemu-iotests/068 index 3801b65..cfa0f2a 100755 --- a/tests/qemu-iotests/068 +++ b/tests/qemu-iotests/068 @@ -76,7 +76,7 @@ for extra_args in \ _make_test_img $IMG_SIZE # Give qemu some time to boot before saving the VM state - bash -c 'sleep 1; echo -e "savevm 0\nquit"' | _qemu $extra_args + { sleep 1; printf "savevm 0\nquit\n"; } | _qemu $extra_args # Now try to continue from that VM state (this should just work) echo quit | _qemu $extra_args -loadvm 0 done diff --git a/tests/qemu-iotests/142 b/tests/qemu-iotests/142 index 9a5b713..1639c83 100755 --- a/tests/qemu-iotests/142 +++ b/tests/qemu-iotests/142 @@ -94,36 +94,36 @@ function check_cache_all() # cache.direct is supposed to be inherited by both bs->file and # bs->backing - echo -e "cache.direct=3Don on none0" + printf "cache.direct=3Don on none0\n" echo "$hmp_cmds" | run_qemu -drive "$files","$ids",cache.direct=3Don |= grep -e "Cache" -e "[Cc]annot|[Cc]ould not|[Cc]an't" - echo -e "\ncache.direct=3Don on file" + printf "\ncache.direct=3Don on file\n" echo "$hmp_cmds" | run_qemu -drive "$files","$ids",file.cache.direct= =3Don | grep -e "Cache" -e "[Cc]annot|[Cc]ould not|[Cc]an't" - echo -e "\ncache.direct=3Don on backing" + printf "\ncache.direct=3Don on backing\n" echo "$hmp_cmds" | run_qemu -drive "$files","$ids",backing.cache.direc= t=3Don | grep -e "Cache" -e "[Cc]annot|[Cc]ould not|[Cc]an't" - echo -e "\ncache.direct=3Don on backing-file" + printf "\ncache.direct=3Don on backing-file\n" echo "$hmp_cmds" | run_qemu -drive "$files","$ids",backing.file.cache.= direct=3Don | grep -e "Cache" -e "[Cc]annot|[Cc]ould not|[Cc]an't" # cache.writeback is supposed to be inherited by bs->backing; bs->file # always gets cache.writeback=3Don - echo -e "\n\ncache.writeback=3Doff on none0" + printf "\n\ncache.writeback=3Doff on none0\n" echo "$hmp_cmds" | run_qemu -drive "$files","$ids",cache.writeback=3Do= ff | grep -e "Cache" -e "[Cc]annot\|[Cc]ould not\|[Cc]an't" - echo -e "\ncache.writeback=3Doff on file" + printf "\ncache.writeback=3Doff on file\n" echo "$hmp_cmds" | run_qemu -drive "$files","$ids",file.cache.writebac= k=3Doff | grep -e "doesn't" -e "does not" - echo -e "\ncache.writeback=3Doff on backing" + printf "\ncache.writeback=3Doff on backing\n" echo "$hmp_cmds" | run_qemu -drive "$files","$ids",backing.cache.write= back=3Doff | grep -e "doesn't" -e "does not" - echo -e "\ncache.writeback=3Doff on backing-file" + printf "\ncache.writeback=3Doff on backing-file\n" echo "$hmp_cmds" | run_qemu -drive "$files","$ids",backing.file.cache.= writeback=3Doff | grep -e "doesn't" -e "does not" # cache.no-flush is supposed to be inherited by both bs->file and bs->= backing - echo -e "\n\ncache.no-flush=3Don on none0" + printf "\n\ncache.no-flush=3Don on none0\n" echo "$hmp_cmds" | run_qemu -drive "$files","$ids",cache.no-flush=3Don= | grep -e "Cache" -e "[Cc]annot\|[Cc]ould not\|[Cc]an't" - echo -e "\ncache.no-flush=3Don on file" + printf "\ncache.no-flush=3Don on file\n" echo "$hmp_cmds" | run_qemu -drive "$files","$ids",file.cache.no-flush= =3Don | grep -e "Cache" -e "[Cc]annot\|[Cc]ould not\|[Cc]an't" - echo -e "\ncache.no-flush=3Don on backing" + printf "\ncache.no-flush=3Don on backing\n" echo "$hmp_cmds" | run_qemu -drive "$files","$ids",backing.cache.no-fl= ush=3Don | grep -e "Cache" -e "[Cc]annot\|[Cc]ould not\|[Cc]an't" - echo -e "\ncache.no-flush=3Don on backing-file" + printf "\ncache.no-flush=3Don on backing-file\n" echo "$hmp_cmds" | run_qemu -drive "$files","$ids",backing.file.cache.= no-flush=3Don | grep -e "Cache" -e "[Cc]annot\|[Cc]ould not\|[Cc]an't" } @@ -236,35 +236,35 @@ function check_cache_all_separate() { # Check cache.direct - echo -e "cache.direct=3Don on blk" + printf "cache.direct=3Don on blk\n" echo "$hmp_cmds" | run_qemu -drive "$drv_bkfile" -drive "$drv_bk" -dri= ve "$drv_file" -drive "$drv_img",cache.direct=3Don | grep -e "Cache" -e "[C= c]annot\|[Cc]ould not\|[Cc]an't" - echo -e "\ncache.direct=3Don on file" + printf "\ncache.direct=3Don on file\n" echo "$hmp_cmds" | run_qemu -drive "$drv_bkfile" -drive "$drv_bk" -dri= ve "$drv_file",cache.direct=3Don -drive "$drv_img" | grep -e "Cache" -e "[C= c]annot\|[Cc]ould not\|[Cc]an't" - echo -e "\ncache.direct=3Don on backing" + printf "\ncache.direct=3Don on backing\n" echo "$hmp_cmds" | run_qemu -drive "$drv_bkfile" -drive "$drv_bk",cach= e.direct=3Don -drive "$drv_file" -drive "$drv_img" | grep -e "Cache" -e "[C= c]annot\|[Cc]ould not\|[Cc]an't" - echo -e "\ncache.direct=3Don on backing-file" + printf "\ncache.direct=3Don on backing-file\n" echo "$hmp_cmds" | run_qemu -drive "$drv_bkfile",cache.direct=3Don -dr= ive "$drv_bk" -drive "$drv_file" -drive "$drv_img" | grep -e "Cache" -e "[C= c]annot\|[Cc]ould not\|[Cc]an't" # Check cache.writeback - echo -e "\n\ncache.writeback=3Doff on blk" + printf "\n\ncache.writeback=3Doff on blk\n" echo "$hmp_cmds" | run_qemu -drive "$drv_bkfile" -drive "$drv_bk" -dri= ve "$drv_file" -drive "$drv_img",cache.writeback=3Doff | grep -e "Cache" -e= "[Cc]annot\|[Cc]ould not\|[Cc]an't" - echo -e "\ncache.writeback=3Doff on file" + printf "\ncache.writeback=3Doff on file\n" echo "$hmp_cmds" | run_qemu -drive "$drv_bkfile" -drive "$drv_bk" -dri= ve "$drv_file",cache.writeback=3Doff -drive "$drv_img" | grep -e "Cache" -e= "[Cc]annot\|[Cc]ould not\|[Cc]an't" - echo -e "\ncache.writeback=3Doff on backing" + printf "\ncache.writeback=3Doff on backing\n" echo "$hmp_cmds" | run_qemu -drive "$drv_bkfile" -drive "$drv_bk",cach= e.writeback=3Doff -drive "$drv_file" -drive "$drv_img" | grep -e "Cache" -e= "[Cc]annot\|[Cc]ould not\|[Cc]an't" - echo -e "\ncache.writeback=3Doff on backing-file" + printf "\ncache.writeback=3Doff on backing-file\n" echo "$hmp_cmds" | run_qemu -drive "$drv_bkfile",cache.writeback=3Doff= -drive "$drv_bk" -drive "$drv_file" -drive "$drv_img" | grep -e "Cache" -e= "[Cc]annot\|[Cc]ould not\|[Cc]an't" # Check cache.no-flush - echo -e "\n\ncache.no-flush=3Don on blk" + printf "\n\ncache.no-flush=3Don on blk\n" echo "$hmp_cmds" | run_qemu -drive "$drv_bkfile" -drive "$drv_bk" -dri= ve "$drv_file" -drive "$drv_img",cache.no-flush=3Don | grep -e "Cache" -e "= [Cc]annot\|[Cc]ould not\|[Cc]an't" - echo -e "\ncache.no-flush=3Don on file" + printf "\ncache.no-flush=3Don on file\n" echo "$hmp_cmds" | run_qemu -drive "$drv_bkfile" -drive "$drv_bk" -dri= ve "$drv_file",cache.no-flush=3Don -drive "$drv_img" | grep -e "Cache" -e "= [Cc]annot\|[Cc]ould not\|[Cc]an't" - echo -e "\ncache.no-flush=3Don on backing" + printf "\ncache.no-flush=3Don on backing\n" echo "$hmp_cmds" | run_qemu -drive "$drv_bkfile" -drive "$drv_bk",cach= e.no-flush=3Don -drive "$drv_file" -drive "$drv_img" | grep -e "Cache" -e "= [Cc]annot\|[Cc]ould not\|[Cc]an't" - echo -e "\ncache.no-flush=3Don on backing-file" + printf "\ncache.no-flush=3Don on backing-file\n" echo "$hmp_cmds" | run_qemu -drive "$drv_bkfile",cache.no-flush=3Don -= drive "$drv_bk" -drive "$drv_file" -drive "$drv_img" | grep -e "Cache" -e "= [Cc]annot\|[Cc]ould not\|[Cc]an't" } diff --git a/tests/qemu-iotests/171 b/tests/qemu-iotests/171 index 257be10..54298ad 100755 --- a/tests/qemu-iotests/171 +++ b/tests/qemu-iotests/171 @@ -45,15 +45,15 @@ _supported_os Linux # Create JSON with options img_json() { - echo -n 'json:{"driver":"raw", ' - echo -n "\"offset\":\"$img_offset\", " + printf 'json:{"driver":"raw", ' + printf "\"offset\":\"$img_offset\", " if [ "$img_size" -ne -1 ] ; then - echo -n "\"size\":\"$img_size\", " + printf "\"size\":\"$img_size\", " fi - echo -n '"file": {' - echo -n '"driver":"file", ' - echo -n "\"filename\":\"$TEST_IMG\" " - echo -n "} }" + printf '"file": {' + printf '"driver":"file", ' + printf %s "\"filename\":\"$TEST_IMG\" " + printf "} }" } do_general_test() { diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check index 4b1c674..0a13df9 100755 --- a/tests/qemu-iotests/check +++ b/tests/qemu-iotests/check @@ -141,7 +141,7 @@ _wallclock() _timestamp() { now=3D`date "+%T"` - echo -n " [$now]" + printf " [$now]" } _wrapup() @@ -255,7 +255,7 @@ seq=3D"check" for seq in $list do err=3Dfalse - echo -n "$seq" + printf "$seq" if [ -n "$TESTS_REMAINING_LOG" ] ; then sed -e "s/$seq//" -e 's/ / /' -e 's/^ *//' $TESTS_REMAINING_LOG >= $TESTS_REMAINING_LOG.tmp mv $TESTS_REMAINING_LOG.tmp $TESTS_REMAINING_LOG @@ -281,9 +281,9 @@ do rm -f $seq.out.bad lasttime=3D`sed -n -e "/^$seq /s/.* //p" <$TIMESTAMP_FILE` if [ "X$lasttime" !=3D X ]; then - echo -n " ${lasttime}s ..." + printf " ${lasttime}s ..." else - echo -n " " # prettier output with timestamp= s. + printf " " # prettier output with timestamps. fi rm -f core $seq.notrun @@ -291,7 +291,7 @@ do echo "$seq" > "${TEST_DIR}"/check.sts start=3D`_wallclock` - $timestamp && echo -n " ["`date "+%T"`"]" + $timestamp && printf " [$(date "+%T")]" if [ "$(head -n 1 "$source_iotests/$seq")" =3D=3D "#!/usr/bin/env = python" ]; then run_command=3D"$PYTHON $seq" @@ -314,21 +314,21 @@ do if [ -f core ] then - echo -n " [dumped core]" + printf " [dumped core]" mv core $seq.core err=3Dtrue fi if [ -f $seq.notrun ] then - $timestamp || echo -n " [not run] " - $timestamp && echo " [not run]" && echo -n " $seq -- " + $timestamp || printf " [not run] " + $timestamp && echo " [not run]" && printf " $seq -- " cat $seq.notrun notrun=3D"$notrun $seq" else if [ $sts -ne 0 ] then - echo -n " [failed, exit status $sts]" + printf " [failed, exit status $sts]" err=3Dtrue fi diff --git a/tests/rocker/all b/tests/rocker/all index d5ae963..3f9b786 100755 --- a/tests/rocker/all +++ b/tests/rocker/all @@ -1,19 +1,19 @@ -echo -n "Running port test... " +printf "Running port test... " ./port if [ $? -eq 0 ]; then echo "pass"; else echo "FAILED"; exit 1; fi -echo -n "Running bridge test... " +printf "Running bridge test... " ./bridge if [ $? -eq 0 ]; then echo "pass"; else echo "FAILED"; exit 1; fi -echo -n "Running bridge STP test... " +printf "Running bridge STP test... " ./bridge-stp if [ $? -eq 0 ]; then echo "pass"; else echo "FAILED"; exit 1; fi -echo -n "Running bridge VLAN test... " +printf "Running bridge VLAN test... " ./bridge-vlan if [ $? -eq 0 ]; then echo "pass"; else echo "FAILED"; exit 1; fi -echo -n "Running bridge VLAN STP test... " +printf "Running bridge VLAN STP test... " ./bridge-vlan-stp if [ $? -eq 0 ]; then echo "pass"; else echo "FAILED"; exit 1; fi diff --git a/tests/tcg/cris/Makefile b/tests/tcg/cris/Makefile index 6b3dba4..6888263 100644 --- a/tests/tcg/cris/Makefile +++ b/tests/tcg/cris/Makefile @@ -150,17 +150,17 @@ check_addcv17.tst: crtv10.o sysv10.o build: $(CRT) $(SYS) $(TESTCASES) check: $(CRT) $(SYS) $(TESTCASES) - @echo -e "\nQEMU simulator." + @printf "\nQEMU simulator.\n" for case in $(TESTCASES); do \ - echo -n "$$case "; \ + printf "$$case "; \ SIMARGS=3D; \ case $$case in *v17*) SIMARGS=3D"-cpu crisv17";; esac; \ $(SIM) $$SIMARGS ./$$case; \ done check-g: $(CRT) $(SYS) $(TESTCASES) - @echo -e "\nGDB simulator." + @printf "\nGDB simulator.\n" @for case in $(TESTCASES); do \ - echo -n "$$case "; \ + printf "$$case "; \ $(SIMG) $$case; \ done --=20 2.9.4