From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= Subject: [PATCH kvm-unit-tests v2 10/12] run_tests: print summary Date: Thu, 17 Dec 2015 18:53:41 +0100 Message-ID: <1450374823-7648-11-git-send-email-rkrcmar@redhat.com> References: <1450374823-7648-1-git-send-email-rkrcmar@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: Paolo Bonzini , Andrew Jones To: kvm@vger.kernel.org Return-path: Received: from mx1.redhat.com ([209.132.183.28]:32800 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754136AbbLQRyZ (ORCPT ); Thu, 17 Dec 2015 12:54:25 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (Postfix) with ESMTPS id 16479C0B7E09 for ; Thu, 17 Dec 2015 17:54:25 +0000 (UTC) In-Reply-To: <1450374823-7648-1-git-send-email-rkrcmar@redhat.com> Sender: kvm-owner@vger.kernel.org List-ID: Might be interesting and hopefully won't break too many scripts. Signed-off-by: Radim Kr=C4=8Dm=C3=A1=C5=99 --- v2: - don't print "0 unexpected failures" in run_tests' summary. [Drew] (This could have been done in lib/report, but I'm not sure why we wa= nt to always print it in the summary, so I've kept it there.) - use $testname - don't buffer the output (a serious bug in v1) - worse performance (reads the output of all tests) =20 run_tests.sh | 1 + scripts/mkstandalone.sh | 2 ++ scripts/run.bash | 5 ++++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/run_tests.sh b/run_tests.sh index e09d410beaa4..62c106a0b693 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -30,6 +30,7 @@ EOF =20 __run() { ./$TEST_DIR-run "${@}"; } __eval_log() { eval "${@}" >> test.log; } +__echo_last_log() { cat test.log; } # XXX: ignores the 'last' bit =20 echo > test.log =20 diff --git a/scripts/mkstandalone.sh b/scripts/mkstandalone.sh index 778383077769..c37f694398b8 100755 --- a/scripts/mkstandalone.sh +++ b/scripts/mkstandalone.sh @@ -104,7 +104,9 @@ __run() \$qemu \$cmdline -smp $smp $opts } =20 +# log goes to stdout and nothing is remembered __eval_log() { eval "\${@}"; } +__echo_last_log() { echo; } =20 run `escape "${@}"` exit \$? diff --git a/scripts/run.bash b/scripts/run.bash index f532cb9e8b1c..d3e8d37d315d 100644 --- a/scripts/run.bash +++ b/scripts/run.bash @@ -46,7 +46,10 @@ function run() *) echo -ne "\e[31mFAIL\e[0m" esac =20 - echo " $1" + echo -n " $testname" + + __echo_last_log | sed 'x;$s/^SUMMARY: //;ta;$s/.*//p;d; + :a s/, 0 unexpected failures//;s/^/ (/;s/= $/)/' =20 return $ret } --=20 2.6.4