From nobody Mon Feb 9 22:23:12 2026 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=1599219796; cv=none; d=zohomail.com; s=zohoarc; b=W2GxYI5qI2rfcMb7WS1Q0OGz2miCO4rOExDjJKKuuvBx80w/SDIAE3B/n4VHtNyktmqJedHFZP2IYJHkyyS+y6C1xs99ZXN84Oqjh/gO+sPJaSu9Kqh+niIt3mryxeDr4ulM++yzoVg/dmF7hZF6Ow3csjkoZoY7+mNYUXcRXIE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599219796; 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=/9kMc9+jF8y1oa6oa9FhwzamoYL7mMegG8SjpygQ5/Q=; b=VEHevgQ0IY9oaZSfBjNmDuvxeEk+wyB6jWgRQLltYfOnHf4GinHaQyzxb2Nci/5kMYqFeuSlisnY59F0JKyDRN0xrejK8fLta1Kha74AZny/4vQX3N3ZKgocDQj5KZP155uOeKraDesLB2L+SQX2jczSaJ/jx/sCtFbUC+fwF0M= 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 1599219796378718.7270379031621; Fri, 4 Sep 2020 04:43:16 -0700 (PDT) Received: from localhost ([::1]:34174 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kEA7f-0001ij-LP for importer@patchew.org; Fri, 04 Sep 2020 07:43:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42410) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kEA62-000897-NI for qemu-devel@nongnu.org; Fri, 04 Sep 2020 07:41:34 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:31383 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-0005Ao-EI for qemu-devel@nongnu.org; Fri, 04 Sep 2020 07:41:34 -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-522-jc5YM0jhMZK1zMCh2AbdtA-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 9FE7A1084C95 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 6572A5D9F7 for ; Fri, 4 Sep 2020 11:41:25 +0000 (UTC) X-MC-Unique: jc5YM0jhMZK1zMCh2AbdtA-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 05/46] mtest2make: split working directory from test command Date: Fri, 4 Sep 2020 07:40:41 -0400 Message-Id: <20200904114122.31307-6-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=205.139.110.61; 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 01:57:11 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_H3=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" Content-Type: text/plain; charset="utf-8" Pass the working directory 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 | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/scripts/mtest2make.py b/scripts/mtest2make.py index f4ee4d3994..c709b37f28 100644 --- a/scripts/mtest2make.py +++ b/scripts/mtest2make.py @@ -19,16 +19,16 @@ class Suite(object): print(''' SPEED =3D quick =20 -# $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" +# $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-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 .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.env.$1),$(.test.cmd.$1),$(.test.n= ame.$1)) && $(call .test-$2-$(.test.driver.$1),$(.test.env.$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),$(.test.dir.$1)) =20 define .test.human_k @exec 3>&1; rc=3D0; $(foreach TEST, $1, $(call .test.run,$(TEST),h= uman) || rc=3D$$?;) \\ @@ -66,11 +66,11 @@ for test in json.load(sys.stdin): else: test['cmd'][0] =3D executable 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' =20 i +=3D 1 + if test['workdir'] is not None: + print('.test.dir.%d :=3D %s' % (i, shlex.quote(test['workdir']))) 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)) --=20 2.26.2