From nobody Fri Apr 26 04:27:59 2024 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=1600247129; cv=none; d=zohomail.com; s=zohoarc; b=fF+nKVJfjMUiUgLhwFMFPItSut+zQRgkvlNkdi1d6gbF7PRrPU4xN0Lz8nd9/yWbFGinBrQ/bIvZRcra8OqIS7Q7B8l7JDp9IxXwM5ckQh97a+Q5jgXmI1EEOaQXBkD1Khr51jmu7370GOBYbaS9PoQbKGpR3jQj9S1gagtnmUM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600247129; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=pmQj9D3oj5azyJfN4pDUPZ65bh9EuotL2ZXMEohF4fA=; b=WeQN8GwL0Bprs9hVI2FMd70NVuK2SF992n5hW76YoIh0BoKjzAUIMruHcO7/R7sZix8f5wglI1XbfY0D0CfqJ9KMTn97seXipgJM4/+BCF+txiRr5ieDnYqix/muqon83qfRULQOnGvoC1D82m3Mu0QJ2+MiE+vUfdA3mv/VVUk= 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 1600247129970553.851639109296; Wed, 16 Sep 2020 02:05:29 -0700 (PDT) Received: from localhost ([::1]:43698 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kITNY-0001I9-8n for importer@patchew.org; Wed, 16 Sep 2020 05:05:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40850) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kITMh-0000lM-3E for qemu-devel@nongnu.org; Wed, 16 Sep 2020 05:04:35 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:27720) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kITMb-0002OM-4Y for qemu-devel@nongnu.org; Wed, 16 Sep 2020 05:04: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-356-eygDPNwLOQuhKcjdd6A37w-1; Wed, 16 Sep 2020 05:04:23 -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 5002E107464B for ; Wed, 16 Sep 2020 09:04:22 +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 0C8945DE46; Wed, 16 Sep 2020 09:04:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600247066; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pmQj9D3oj5azyJfN4pDUPZ65bh9EuotL2ZXMEohF4fA=; b=Oi4cNqGUONJeJkYPRUaL/DDjj4GdVDBBRUw9g5WUE9ymM8E/FDDpVTk/LUX9J1JMZ67/dZ WS+DY6gJdxHBgq3+ZyjtxN55awTLoIxZPwidskYf0thJsedhP/3XfYn9FLRTjdJqQj46rd YOiKHrHYTLEgHiYRqohWzSWkMTeZUUI= X-MC-Unique: eygDPNwLOQuhKcjdd6A37w-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH] mtest2make: add support for introspected test dependencies Date: Wed, 16 Sep 2020 05:04:21 -0400 Message-Id: <20200916090421.9582-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=63.128.21.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/16 02:35:56 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -50 X-Spam_score: -5.1 X-Spam_bar: ----- X-Spam_report: (-5.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.999, 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: , Cc: philmd@redhat.com 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" Right now all "make check" targets depend blindly on "all". If Meson is 0.56.0 or newer, we can use the correct dependencies using the new "depends" entry in "meson introspect --tests". Signed-off-by: Paolo Bonzini --- Makefile | 2 +- scripts/mtest2make.py | 19 +++++++++++++++---- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 7c60b9dcb8..cb5cd930c8 100644 --- a/Makefile +++ b/Makefile @@ -78,7 +78,7 @@ ${ninja-targets-c_COMPILER} ${ninja-targets-cpp_COMPILER}= : .var.command +=3D -MP # reread (and MESON won't be empty anymore). ifneq ($(MESON),) Makefile.mtest: build.ninja scripts/mtest2make.py - $(MESON) introspect --tests --benchmarks | $(PYTHON) scripts/mtest2make.p= y > $@ + $(MESON) introspect --targets --tests --benchmarks | $(PYTHON) scripts/mt= est2make.py > $@ -include Makefile.mtest endif =20 diff --git a/scripts/mtest2make.py b/scripts/mtest2make.py index 9cbb2e374d..c3489a4605 100644 --- a/scripts/mtest2make.py +++ b/scripts/mtest2make.py @@ -5,6 +5,7 @@ # Author: Paolo Bonzini =20 from collections import defaultdict +import itertools import json import os import shlex @@ -36,7 +37,7 @@ SPEED =3D quick introspect =3D json.load(sys.stdin) i =3D 0 =20 -def process_tests(test, suites): +def process_tests(test, targets, suites): global i env =3D ' '.join(('%s=3D%s' % (shlex.quote(k), shlex.quote(v)) for k, v in test['env'].items())) @@ -58,12 +59,19 @@ def process_tests(test, suites): i +=3D 1 if test['workdir'] is not None: print('.test.dir.%d :=3D %s' % (i, shlex.quote(test['workdir']))) + + if 'depends' in test: + deps =3D (targets.get(x, []) for x in test['depends']) + deps =3D itertools.chain.from_iterable(deps) + else: + deps =3D ['all'] + 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)) print('.PHONY: run-test-%d' % (i,)) - print('run-test-%d: all' % (i,)) + print('run-test-%d: %s' % (i, ' '.join(deps))) print('\t@$(call .test.run,%d,$(.test.output-format))' % (i,)) =20 test_suites =3D test['suite'] or ['default'] @@ -102,16 +110,19 @@ def emit_suite(name, suite, prefix): print('.tests +=3D $(.test.$(SPEED).%s)' % (target, )) print('endif') =20 +targets =3D {t['id']: [os.path.relpath(f) for f in t['filename']] + for t in introspect['targets']} + testsuites =3D defaultdict(Suite) for test in introspect['tests']: - process_tests(test, testsuites) + process_tests(test, targets, testsuites) emit_prolog(testsuites, 'check') for name, suite in testsuites.items(): emit_suite(name, suite, 'check') =20 benchsuites =3D defaultdict(Suite) for test in introspect['benchmarks']: - process_tests(test, benchsuites) + process_tests(test, targets, benchsuites) emit_prolog(benchsuites, 'bench') for name, suite in benchsuites.items(): emit_suite(name, suite, 'bench') --=20 2.26.2