From patchwork Thu Dec 17 17:53:41 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?UmFkaW0gS3LEjW3DocWZ?= X-Patchwork-Id: 7875761 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id BB8E09F32E for ; Thu, 17 Dec 2015 17:54:32 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id F3986203FB for ; Thu, 17 Dec 2015 17:54:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0B3A920263 for ; Thu, 17 Dec 2015 17:54:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753710AbbLQRy0 (ORCPT ); Thu, 17 Dec 2015 12:54:26 -0500 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) Received: from potion (dhcp-1-105.brq.redhat.com [10.34.1.105]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with SMTP id tBHHsMnE026660; Thu, 17 Dec 2015 12:54:23 -0500 Received: by potion (sSMTP sendmail emulation); Thu, 17 Dec 2015 18:54:22 +0100 From: =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= To: kvm@vger.kernel.org Cc: Paolo Bonzini , Andrew Jones 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> In-Reply-To: <1450374823-7648-1-git-send-email-rkrcmar@redhat.com> References: <1450374823-7648-1-git-send-email-rkrcmar@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Might be interesting and hopefully won't break too many scripts. Signed-off-by: Radim Kr?má? --- 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 want 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) 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 __run() { ./$TEST_DIR-run "${@}"; } __eval_log() { eval "${@}" >> test.log; } +__echo_last_log() { cat test.log; } # XXX: ignores the 'last' bit echo > test.log 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 } +# log goes to stdout and nothing is remembered __eval_log() { eval "\${@}"; } +__echo_last_log() { echo; } 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 - echo " $1" + echo -n " $testname" + + __echo_last_log | sed 'x;$s/^SUMMARY: //;ta;$s/.*//p;d; + :a s/, 0 unexpected failures//;s/^/ (/;s/$/)/' return $ret }