From nobody Tue Feb 10 15:45:48 2026 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=1597682943; cv=none; d=zohomail.com; s=zohoarc; b=CDGfzZfd813WusG7l2TDh5Od7Sw5CbArwiu4+uyGhT5CCvzvU0CINkpH5DI7unJvJdR35erRfS36icRk4lA9OQ+tbSyw3A5cOW/cIp6uMioVwYGvajSFifZT0L+s1aVVG0SIf78sIBmswDML6xNUuzKx6QLBZ8Ei9yz9PSfDFnI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597682943; 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=m8iALnws/4P8XFS7ASMygeM/FNJ8v2QCeJ8+FY6qu6o=; b=DJWdJq6mX8pt95UjkEBEwlP5Py45KMj80tuND1LkoDM85IrCuisshBuWuh9pQll3o2ioZNUBsa/wbfZ+dwYtthuVXVMQcLps5vWLBkhlzCxbNnegdAORYDxhNAnlYpcHYpkS9ywOvHvkKMchpe9EO8ycDyKPvaySRltnhHnUmkU= 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 1597682943156632.6702832591997; Mon, 17 Aug 2020 09:49:03 -0700 (PDT) Received: from localhost ([::1]:57826 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7h8Y-0005gF-Qr for importer@patchew.org; Mon, 17 Aug 2020 11:33:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43012) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gLH-0003oM-57 for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:42:31 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:41032) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k7gLD-0006wI-36 for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:42:30 -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-416-7S2deayVPSOyZ9cEE8pHbw-1; Mon, 17 Aug 2020 10:42:24 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DAB8C81F001 for ; Mon, 17 Aug 2020 14:42:23 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-113-20.ams2.redhat.com [10.36.113.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3F30470C3D for ; Mon, 17 Aug 2020 14:42:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597675346; 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=m8iALnws/4P8XFS7ASMygeM/FNJ8v2QCeJ8+FY6qu6o=; b=BsT5roKhb5VzmidvNFK1fMFFQOkji4V+BcExBmqWdBy22pd9Ao+D1QHYu3vrQ+R39S1WSK mtMq/6hDCuh/jRUpKAJWl2QTc0Ko0PZUe4O98goS5yopQlsiVy9T773o7OhvvaMn2+tP0X kqwst9PXxBhPK1vFAXnptYRT8fAmmqw= X-MC-Unique: 7S2deayVPSOyZ9cEE8pHbw-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 140/150] meson: convert check-block Date: Mon, 17 Aug 2020 16:40:43 +0200 Message-Id: <20200817144053.345107-45-pbonzini@redhat.com> In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.001 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/08/17 01:24:49 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=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" Signed-off-by: Paolo Bonzini --- meson.build | 2 ++ tests/Makefile.include | 16 ++-------------- tests/meson.build | 4 ++++ tests/qemu-iotests/meson.build | 10 ++++++++++ 4 files changed, 18 insertions(+), 14 deletions(-) create mode 100644 tests/qemu-iotests/meson.build diff --git a/meson.build b/meson.build index c29627e83b..488d0999a8 100644 --- a/meson.build +++ b/meson.build @@ -999,9 +999,11 @@ if have_tools dependencies: [authz, block, crypto, io, qom, qemuutil], inst= all: true) qemu_io =3D executable('qemu-io', files('qemu-io.c'), dependencies: [block, qemuutil], install: true) + qemu_block_tools =3D [qemu_img, qemu_io] if host_machine.system() =3D=3D 'linux' or host_machine.system() =3D=3D = 'sunos' or host_machine.system().endswith('bsd') qemu_nbd =3D executable('qemu-nbd', files('qemu-nbd.c'), dependencies: [block, qemuutil], install: true) + qemu_block_tools +=3D [qemu_nbd] endif =20 subdir('storage-daemon') diff --git a/tests/Makefile.include b/tests/Makefile.include index c3874cafd2..e023df817d 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -160,8 +160,6 @@ check-unit-y +=3D tests/test-uuid$(EXESUF) check-unit-y +=3D tests/ptimer-test$(EXESUF) check-unit-y +=3D tests/test-qapi-util$(EXESUF) =20 -check-block-$(call land,$(CONFIG_POSIX),$(CONFIG_SOFTMMU)) +=3D tests/chec= k-block.sh - generated-files-y +=3D tests/test-qapi-types.h generated-files-y +=3D tests/include/test-qapi-types-sub-module.h generated-files-y +=3D tests/test-qapi-types-sub-sub-module.h @@ -480,14 +478,6 @@ check-tcg: $(RUN_TCG_TARGET_RULES) clean-tcg: $(CLEAN_TCG_TARGET_RULES) =20 =20 -QEMU_IOTESTS_HELPERS-$(call land,$(CONFIG_SOFTMMU),$(CONFIG_LINUX)) =3D te= sts/qemu-iotests/socket_scm_helper$(EXESUF) - -.PHONY: check-tests/check-block.sh -check-tests/check-block.sh: tests/check-block.sh qemu-img$(EXESUF) \ - qemu-io$(EXESUF) qemu-nbd$(EXESUF) $(QEMU_IOTESTS_HELPERS-y) \ - $(patsubst %-softmmu,qemu-system-%,$(filter %-softmmu,$(TARGET_DIRS))) - @$< - # Python venv for running tests =20 .PHONY: check-venv check-acceptance @@ -541,13 +531,13 @@ check-acceptance: check-venv $(TESTS_RESULTS_DIR) get= -vm-images =20 # Consolidated targets =20 -.PHONY: check-block check-unit check check-clean get-vm-images +.PHONY: check-unit check check-clean get-vm-images ifeq ($(CONFIG_TOOLS),y) check-block: $(patsubst %,check-%, $(check-block-y)) endif check-build: build-unit =20 -check: check-block check-unit +check: check-unit check-clean: rm -rf $(check-unit-y) tests/*.o tests/*/*.o $(QEMU_IOTESTS_HELPERS-y) rm -f tests/test-qapi-gen-timestamp @@ -559,8 +549,6 @@ clean: check-clean =20 # Build the help program automatically =20 -all: $(QEMU_IOTESTS_HELPERS-y) - -include $(wildcard tests/*.d) =20 endif diff --git a/tests/meson.build b/tests/meson.build index d724402cf4..f834c272e8 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -1,3 +1,7 @@ +if have_system and 'CONFIG_POSIX' in config_host + subdir('qemu-iotests') +endif + test('decodetree', sh, args: [ files('decode/check.sh'), config_host['PYTHON'], files('../sc= ripts/decodetree.py') ], workdir: meson.current_source_dir() / 'decode', diff --git a/tests/qemu-iotests/meson.build b/tests/qemu-iotests/meson.build new file mode 100644 index 0000000000..3de09fb8fa --- /dev/null +++ b/tests/qemu-iotests/meson.build @@ -0,0 +1,10 @@ +if 'CONFIG_LINUX' in config_host + socket_scm_helper =3D executable('socket_scm_helper', 'socket_scm_help= er.c', + build_by_default: false) +else + socket_scm_helper =3D [] +endif +test('qemu-iotests', sh, args: [files('../check-block.sh')], + depends: [qemu_block_tools, emulators, socket_scm_helper], + suite: 'block', timeout: 10000) + --=20 2.26.2