From nobody Fri Dec 19 20:11:21 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1599219890; cv=none; d=zohomail.com; s=zohoarc; b=WQhfBUZurtyHKwo5bnVf0XuykH1Gd2AnI6SLLCNVe/fydyMZvw3nz/CIpNqBDAG/+cydTTtUEc7hlqkeQSIITjdUtrEBS5iHyULS+hCwSvTtj6Aiqnizc9KlNbWbNzXx3W9mqmuy8zmt4uQslGpjnMA/LINnKTd0OxV9InaBfOI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599219890; 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=f20Kgd0fTQlhIaQNRx25vbOQH4ri8oVzi6n+td6YziY=; b=QEoT/IQGf3Jn/0IEqDLlPQCp74LnHrFl/A8A0vpyfMrm21bDJfIH/ay7ezUniXcfcZVksMXFaepz8lz0HHEJNHptSMvTFB7YtommhDRuj2H+cix/MZfJx6nxYch3at3r/mvQTqYy62bwPh/2jb3fulpoBeWTINYVg7zmE85QrDs= ARC-Authentication-Results: i=1; mx.zohomail.com; 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=fail 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 1599219890891933.368796945927; Fri, 4 Sep 2020 04:44:50 -0700 (PDT) Received: from localhost ([::1]:42066 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kEA9B-0004ti-Vi for importer@patchew.org; Fri, 04 Sep 2020 07:44:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42388) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kEA61-00088I-Rv for qemu-devel@nongnu.org; Fri, 04 Sep 2020 07:41:34 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:48952 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kEA5w-0005Ar-DH for qemu-devel@nongnu.org; Fri, 04 Sep 2020 07:41:33 -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-363-BTHO2joHPc6k9vjCVRTCsw-1; Fri, 04 Sep 2020 07:41:26 -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 4408A344F1 for ; Fri, 4 Sep 2020 11:41:25 +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 090495D9F7 for ; Fri, 4 Sep 2020 11:41:24 +0000 (UTC) X-MC-Unique: BTHO2joHPc6k9vjCVRTCsw-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 04/46] mtest2make: split environment from test command Date: Fri, 4 Sep 2020 07:40:40 -0400 Message-Id: <20200904114122.31307-5-pbonzini@redhat.com> In-Reply-To: <20200904114122.31307-1-pbonzini@redhat.com> References: <20200904114122.31307-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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=207.211.31.81; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/04 03:57:33 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-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" Content-Type: text/plain; charset="utf-8" Pass the environment and test command in separate macro arguments, so that we will be able to insert a test driver in the next patch. Signed-off-by: Paolo Bonzini --- scripts/mtest2make.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/scripts/mtest2make.py b/scripts/mtest2make.py index d7a51bf97e..f4ee4d3994 100644 --- a/scripts/mtest2make.py +++ b/scripts/mtest2make.py @@ -19,16 +19,16 @@ class Suite(object): print(''' SPEED =3D quick =20 -# $1 =3D test command, $2 =3D test name -.test-human-tap =3D $1 < /dev/null | ./scripts/tap-driver.pl --test-name= =3D"$2" $(if $(V),,--show-failures-only) -.test-human-exitcode =3D $1 < /dev/null -.test-tap-tap =3D $1 < /dev/null | sed "s/^[a-z][a-z]* [0-9]*/& $2/" || tr= ue -.test-tap-exitcode =3D printf "%s\\n" 1..1 "`$1 < /dev/null > /dev/null ||= echo "not "`ok 1 $2" -.test.print =3D echo $(if $(V),'$1','Running test $2') >&3 +# $1 =3D environment, $2 =3D test command, $3 =3D test name +.test-human-tap =3D $1 $2 < /dev/null | ./scripts/tap-driver.pl --test-nam= e=3D"$3" $(if $(V),,--show-failures-only) +.test-human-exitcode =3D $1 $2 < /dev/null +.test-tap-tap =3D $1 $2 < /dev/null | sed "s/^[a-z][a-z]* [0-9]*/& $3/" ||= true +.test-tap-exitcode =3D printf "%s\\n" 1..1 "`$1 $2 < /dev/null > /dev/null= || echo "not "`ok 1 $3" +.test.print =3D echo $(if $(V),'$1 $2','Running test $3') >&3 .test.env =3D MALLOC_PERTURB_=3D$${MALLOC_PERTURB_:-$$(( $${RANDOM:-0} % 2= 55 + 1))} =20 # $1 =3D test name, $2 =3D test target (human or tap) -.test.run =3D $(call .test.print,$(.test.cmd.$1),$(.test.name.$1)) && $(ca= ll .test-$2-$(.test.driver.$1),$(.test.cmd.$1),$(.test.name.$1)) +.test.run =3D $(call .test.print,$(.test.env.$1),$(.test.cmd.$1),$(.test.n= ame.$1)) && $(call .test-$2-$(.test.driver.$1),$(.test.env.$1),$(.test.cmd.= $1),$(.test.name.$1)) =20 define .test.human_k @exec 3>&1; rc=3D0; $(foreach TEST, $1, $(call .test.run,$(TEST),h= uman) || rc=3D$$?;) \\ @@ -65,7 +65,7 @@ for test in json.load(sys.stdin): test['cmd'][0] =3D executable else: test['cmd'][0] =3D executable - cmd =3D '$(.test.env) %s %s' % (env, ' '.join((shlex.quote(x) for x in= test['cmd']))) + cmd =3D ' '.join((shlex.quote(x) for x in test['cmd'])) if test['workdir'] is not None: cmd =3D '(cd %s && %s)' % (shlex.quote(test['workdir']), cmd) driver =3D test['protocol'] if 'protocol' in test else 'exitcode' @@ -73,6 +73,7 @@ for test in json.load(sys.stdin): i +=3D 1 print('.test.name.%d :=3D %s' % (i, test['name'])) print('.test.driver.%d :=3D %s' % (i, driver)) + print('.test.env.%d :=3D $(.test.env) %s' % (i, env)) print('.test.cmd.%d :=3D %s' % (i, cmd)) =20 test_suites =3D test['suite'] or ['default'] --=20 2.26.2