From nobody Sun Nov 16 07:41:30 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1599052374; cv=none; d=zohomail.com; s=zohoarc; b=lvq833Kyy71xappUjhrdrBHYpWE0LvsvzF8bIQ2K07X8IkPW+AKdl1KuTJDbWfL1nh4x44pzSQrBJhRE72ViVGjjnssCNKclre3Gh0Leep1IPxLAjhDqv+dG6KRu2maB2zQFfMPunO9tzMdM2E3SVCv2+oXR/B1JHGvkIkf/1Oc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599052374; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=gnhNI53pp0I160tRA3kVNiu0HLRb2ej6NXMxcodi4J4=; b=NKFXS6dqUGXm6D8fWADoi9X8Jxczs03fj3aQIT0Ngs/6ZI5n6r4p66LSwMcHI85KbUYsr1S8VBisyIWfIhBFzl04oxsTTsIzkT6UjHJZNUvff4fP+vDVgNbbJpw/PMK9IM59V4NFoCZKT/x38BCt2OOcI3KGocvnkGkIMr2qwYk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1599052374066970.9326585693332; Wed, 2 Sep 2020 06:12:54 -0700 (PDT) Received: from localhost ([::1]:52284 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDSZJ-0006zx-4Y for importer@patchew.org; Wed, 02 Sep 2020 09:12:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36972) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDSMW-0006F5-DC for qemu-devel@nongnu.org; Wed, 02 Sep 2020 08:59:40 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:53052) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kDSMT-00079N-8B for qemu-devel@nongnu.org; Wed, 02 Sep 2020 08:59:40 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-499-0rE1HoluPYy_z2gOAYiQOw-1; Wed, 02 Sep 2020 08:59:25 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 485CC80046A for ; Wed, 2 Sep 2020 12:59:20 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0ABE65D9CC for ; Wed, 2 Sep 2020 12:59:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599051576; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gnhNI53pp0I160tRA3kVNiu0HLRb2ej6NXMxcodi4J4=; b=c1WAq9gS69lh8JRmE60FHf8hkKZDGBZ4KcpdnWMMWkPcna9OCE/pzM7Frs6Cy6R8eKp9u7 X4XxAc5lCD45hR32OBCMwsfylxnqarCf67ujg1h67RNhJo19LpPEbExuCJRSIsv2FHy3k4 RUVaefrpBWcfj/hBIqFEC2JlRuUqWUQ= X-MC-Unique: 0rE1HoluPYy_z2gOAYiQOw-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 04/39] mtest2make: hide output of successful tests Date: Wed, 2 Sep 2020 08:58:42 -0400 Message-Id: <20200902125917.26021-5-pbonzini@redhat.com> In-Reply-To: <20200902125917.26021-1-pbonzini@redhat.com> References: <20200902125917.26021-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/02 01:13:52 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" The softfloat tests are quite noisy; before the Meson conversion they buffered the output in a file and emitted the output only if the test failed. Tweak mtest2make.py so that the courtesy is extended to all non-TAP tests. Signed-off-by: Paolo Bonzini --- scripts/mtest2make.py | 2 +- scripts/test-driver.py | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 scripts/test-driver.py diff --git a/scripts/mtest2make.py b/scripts/mtest2make.py index c709b37f28..27425080cf 100644 --- a/scripts/mtest2make.py +++ b/scripts/mtest2make.py @@ -21,7 +21,7 @@ SPEED =3D quick =20 # $1 =3D environment, $2 =3D test command, $3 =3D test name, $4 =3D dir .test-human-tap =3D $1 $(if $4,(cd $4 && $2),$2) < /dev/null | ./scripts/t= ap-driver.pl --test-name=3D"$3" $(if $(V),,--show-failures-only) -.test-human-exitcode =3D $1 $(if $4,(cd $4 && $2),$2) < /dev/null +.test-human-exitcode =3D $1 $(PYTHON) scripts/test-driver.py $(if $4,-C$4)= $(if $(V),--verbose) -- $2 < /dev/null .test-tap-tap =3D $1 $(if $4,(cd $4 && $2),$2) < /dev/null | sed "s/^[a-z]= [a-z]* [0-9]*/& $3/" || true .test-tap-exitcode =3D printf "%s\\n" 1..1 "`$1 $(if $4,(cd $4 && $2),$2) = < /dev/null > /dev/null || echo "not "`ok 1 $3" .test.print =3D echo $(if $(V),'$1 $2','Running test $3') >&3 diff --git a/scripts/test-driver.py b/scripts/test-driver.py new file mode 100644 index 0000000000..eef74b29a8 --- /dev/null +++ b/scripts/test-driver.py @@ -0,0 +1,35 @@ +#! /usr/bin/env python3 + +# Wrapper for tests that hides the output if they succeed. +# Used by "make check" +# +# Copyright (C) 2020 Red Hat, Inc. +# +# Author: Paolo Bonzini + +import subprocess +import sys +import os +import argparse + +parser =3D argparse.ArgumentParser(description=3D'Test driver for QEMU') +parser.add_argument('-C', metavar=3D'DIR', dest=3D'dir', default=3D'.', + help=3D'change to DIR before doing anything else') +parser.add_argument('-v', '--verbose', dest=3D'verbose', action=3D'store_t= rue', + help=3D'be more verbose') +parser.add_argument('test_args', nargs=3Dargparse.REMAINDER) + +args =3D parser.parse_args() +os.chdir(args.dir) + +test_args =3D args.test_args +if test_args[0] =3D=3D '--': + test_args =3D test_args[1:] + +if args.verbose: + result =3D subprocess.run(test_args, stdout=3DNone, stderr=3DNone) +else: + result =3D subprocess.run(test_args, stdout=3Dsubprocess.PIPE, stderr= =3Dsubprocess.STDOUT) + if result.returncode: + sys.stdout.buffer.write(result.stdout) +sys.exit(result.returncode) --=20 2.26.2