From nobody Sun Oct 26 07:37:41 2025 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.zohomail.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; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1521643529068888.7456611443181; Wed, 21 Mar 2018 07:45:29 -0700 (PDT) Received: from localhost ([::1]:55518 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eyezQ-0001sq-0W for importer@patchew.org; Wed, 21 Mar 2018 10:45:20 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37509) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eyevg-0006td-Ez for qemu-devel@nongnu.org; Wed, 21 Mar 2018 10:41:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eyevc-0002DQ-LQ for qemu-devel@nongnu.org; Wed, 21 Mar 2018 10:41:28 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:46722 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eyevc-0002DJ-GV for qemu-devel@nongnu.org; Wed, 21 Mar 2018 10:41:24 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0BCA24023BB3; Wed, 21 Mar 2018 14:41:24 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-117-20.ams2.redhat.com [10.36.117.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5A044215CDA7; Wed, 21 Mar 2018 14:41:23 +0000 (UTC) From: Kevin Wolf To: qemu-devel@nongnu.org Date: Wed, 21 Mar 2018 15:41:05 +0100 Message-Id: <20180321144107.22770-4-kwolf@redhat.com> In-Reply-To: <20180321144107.22770-1-kwolf@redhat.com> References: <20180321144107.22770-1-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Wed, 21 Mar 2018 14:41:24 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Wed, 21 Mar 2018 14:41:24 +0000 (UTC) for IP:'10.11.54.6' DOMAIN:'int-mx06.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'kwolf@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PULL 3/5] tests/multiboot: Test exit code for every qemu run 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: kwolf@redhat.com, peter.maydell@linaro.org 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" Testing the exit code only once after a whole group of tests has completed is not enough, it catches errors only in the very last qemu invocation. We need to have the check after each qemu run. The logging and diff with the reference output is still done once per group to keep things more managable. This is not a problem because the log file accumulates the output of all runs. Signed-off-by: Kevin Wolf Reviewed-by: Jack Schwartz --- tests/multiboot/run_test.sh | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/tests/multiboot/run_test.sh b/tests/multiboot/run_test.sh index 0278148b43..bc9c3670af 100755 --- a/tests/multiboot/run_test.sh +++ b/tests/multiboot/run_test.sh @@ -38,6 +38,17 @@ run_qemu() { ret=3D$? =20 cat test.out >> test.log + + debugexit=3D$((ret & 0x1)) + ret=3D$((ret >> 1)) + + if [ $debugexit !=3D 1 ]; then + printf %b "\e[31m ?? \e[0m $kernel $* (no debugexit used, exit cod= e $ret)\n" + pass=3D0 + elif [ $ret !=3D 0 ]; then + printf %b "\e[31mFAIL\e[0m $kernel $* (exit code $ret)\n" + pass=3D0 + fi } =20 mmap() { @@ -61,19 +72,8 @@ make all for t in mmap modules; do =20 echo > test.log - $t - - debugexit=3D$((ret & 0x1)) - ret=3D$((ret >> 1)) pass=3D1 - - if [ $debugexit !=3D 1 ]; then - printf %b "\e[31m ?? \e[0m $t (no debugexit used, exit code $ret)\= n" - pass=3D0 - elif [ $ret !=3D 0 ]; then - printf %b "\e[31mFAIL\e[0m $t (exit code $ret)\n" - pass=3D0 - fi + $t =20 if ! diff $t.out test.log > /dev/null 2>&1; then printf %b "\e[31mFAIL\e[0m $t (output difference)\n" --=20 2.13.6