From patchwork Thu Sep 3 11:21:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 248997 Delivered-To: patch@linaro.org Received: by 2002:a92:5b9c:0:0:0:0:0 with SMTP id c28csp352311ilg; Thu, 3 Sep 2020 04:26:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzCpvr8zu7xRJAFZfTLhZZR21rao/2kwAj0CNDwl3ohFPuSx0J2t91wUeiPEkDxH5KNF/pT X-Received: by 2002:a25:8812:: with SMTP id c18mr2233822ybl.330.1599132383295; Thu, 03 Sep 2020 04:26:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1599132383; cv=none; d=google.com; s=arc-20160816; b=F+TLXiAxOeoA1hEJDgKnN8klAx3agpXDHR/G/AC0nBbr9pUjQ7oHOCoD/TTpFdOFDa 1JeLDQFNn+2flZlVvO91AYktcQCxdaCK2y5gBOoGKgB0buIhabglSoI5kAJP/uXd+zT3 dzt6EfuNXkwhZ0zGSpl+DUNvW9GVGps6GxgwIcH+Y326+TiipPhtbs2sYBffk8xyR/lc /qgVGVFtqfDI2P3QbRqwRGpPm6ECsC8Syw21VPjl2Gwf5/fFr0UILbvXSlogDPkwJmkT EacAzmOQQSESB+Q3kqulC0ajo36eQ6sA4wsMB4EhS0YPjFKYD31rHTcPIoje7oIG7iBj SFsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=PKpstIcY7X4muCx/xVveAt+vF3elxwMvmZRPrfN9dSs=; b=vH+7cE7MSpwa9NRfdALd0ed5PgRiCRvJ7/dV3GDRwTFUtu5+pWvbTXQdWnfYci/PJL +OnC9OeNH5IeaDe/ZZpRxE9yHDLhszCsQT4jRl5zfhbN+yLFPtkGGCGWkkMoRpBh0mh0 ozzdwgdQ+yuiSya/ouqGzKAdNcrshgudSL3eBoPz7Gnik/oOvpGko2ROCl8BO36+SGaz lzaGb95FGP4rIiaUlyhAWmfs5pl0bLUKm7vfwdGUGAOzAp2MtQRNwPb5YoIMPG2XsdJ3 tNKf/FHPk+vd3rkQlYyWp/6LOfDIxm3Dw7SOyrpZjFiaOK7I0ubhOv4SPPHx4mGF2ORV 0Q1Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=jpLlMGhv; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id x2si2593348ybi.149.2020.09.03.04.26.23 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 03 Sep 2020 04:26:23 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=jpLlMGhv; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:41380 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDnNm-00027k-Qe for patch@linaro.org; Thu, 03 Sep 2020 07:26:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37168) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDnIv-0002bg-7O for qemu-devel@nongnu.org; Thu, 03 Sep 2020 07:21:21 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]:54204) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kDnIt-0007Zo-3s for qemu-devel@nongnu.org; Thu, 03 Sep 2020 07:21:20 -0400 Received: by mail-wm1-x334.google.com with SMTP id u18so2476043wmc.3 for ; Thu, 03 Sep 2020 04:21:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=PKpstIcY7X4muCx/xVveAt+vF3elxwMvmZRPrfN9dSs=; b=jpLlMGhvqRrbHJhLHm6S3PZrHwfXAZqWlfOx8zQCpZtQgAMUYmZ8ODF+wm9ATlYwAz xog77rfIIr1MbjXXW5PcGRbx7pOkckQXwUsw/JsSixbhqOA1zKeO/LWmktvBQsLfS5Op nt4f9JSOelcf+4DpGOxFJiYo/wlWvg5L7fmOli4UbZeLIIxcUyQdBQW0ib29Bxtd0p2y RaLkHsn3YJthEbyT/bBpDWqlnKSqdz2us/mCotrWFAlEJaJ9InGwtTau3pF37Qctap9T hrZfTWYbTX8cg9x5uxJqiMMMuiKKJnarWRU5F9YDDqkh0iFq6gW95ybu1OAv86yeoatl TAdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=PKpstIcY7X4muCx/xVveAt+vF3elxwMvmZRPrfN9dSs=; b=eD6VMBV4+MxHBfjXdkoK5HmcMzGTnA+Eacz5s5DxGZT/ongPRhSmmHcydjsFpIcr0O UfcJNW59IIC4FYXx7FEk1fXI6/Xr5Vk+DIRVVRKcmdMLfOisPUgeV58KoFUJChUOMkpO 96fjFuGQ2tIU7P6edRSU4LwCET5BwmkgZ2fpFHFJdAa0gClnYCwvE1Bc6u9WdUQQ7ME9 TCyqv/LpPSHnIe7bNElG4wzzZadi+azM2f8pnemrJHvKwq0TsFNxMugZHeJAjubA94H8 4/Fh5rE3HcN/ou1Ak3Z9kNB9SUG67en08cZ1mc/F3fpjrrD8pH08NVkB6pqfNVFoxwms oK1g== X-Gm-Message-State: AOAM531yUCnzlrFDXMsANTDODWd+Fjkk2pCUfnrWsX9FxX1LEoamdu7t YbgjPCfwN+v2uq35iHAn31KZvQ== X-Received: by 2002:a1c:7418:: with SMTP id p24mr1970872wmc.123.1599132077590; Thu, 03 Sep 2020 04:21:17 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id o2sm3907598wmo.37.2020.09.03.04.21.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Sep 2020 04:21:12 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 3E7EE1FF91; Thu, 3 Sep 2020 12:21:08 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 5/8] qemu-iotests: move check-block back to Makefiles Date: Thu, 3 Sep 2020 12:21:04 +0100 Message-Id: <20200903112107.27367-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200903112107.27367-1-alex.bennee@linaro.org> References: <20200903112107.27367-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::334; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x334.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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, 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 autolearn=unavailable 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: fam@euphon.net, Kevin Wolf , berrange@redhat.com, "open list:Block layer core" , stefanb@linux.vnet.ibm.com, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, Max Reitz , cota@braap.org, stefanha@redhat.com, marcandre.lureau@redhat.com, pbonzini@redhat.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Paolo Bonzini check-block has its own test harness, unlike every other test. If we capture its output, as is in general nicer to do without V=1, there will be no sign of progress. So for lack of a better option just move the invocation of the test back to Makefile rules. As a side effect, this will also fix "make check" in --disable-tools builds, as they were trying to run qemu-iotests without having made qemu-img before. Signed-off-by: Paolo Bonzini Signed-off-by: Alex Bennée Message-Id: <20200902080046.10412-1-pbonzini@redhat.com> --- meson.build | 2 -- tests/Makefile.include | 15 ++++++++++++--- tests/qemu-iotests/meson.build | 4 ---- 3 files changed, 12 insertions(+), 9 deletions(-) -- 2.20.1 diff --git a/meson.build b/meson.build index 9b5076452b2..599306f59ad 100644 --- a/meson.build +++ b/meson.build @@ -1100,11 +1100,9 @@ if have_tools dependencies: [authz, block, crypto, io, qom, qemuutil], install: true) qemu_io = executable('qemu-io', files('qemu-io.c'), dependencies: [block, qemuutil], install: true) - qemu_block_tools += [qemu_img, qemu_io] if targetos != 'windows' qemu_nbd = executable('qemu-nbd', files('qemu-nbd.c'), dependencies: [block, qemuutil], install: true) - qemu_block_tools += [qemu_nbd] endif subdir('storage-daemon') diff --git a/tests/Makefile.include b/tests/Makefile.include index 9ac8f5b86a6..08301f5bc9b 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -468,7 +468,6 @@ check-tcg: $(RUN_TCG_TARGET_RULES) .PHONY: clean-tcg clean-tcg: $(CLEAN_TCG_TARGET_RULES) - # Python venv for running tests .PHONY: check-venv check-acceptance @@ -523,8 +522,18 @@ check-acceptance: check-venv $(TESTS_RESULTS_DIR) get-vm-images # Consolidated targets .PHONY: check-block check-unit check check-clean get-vm-images -check-block: -check-build: build-unit +check: + +ifeq ($(CONFIG_TOOLS)$(CONFIG_POSIX),yy) +QEMU_IOTESTS_HELPERS-$(CONFIG_LINUX) = tests/qemu-iotests/socket_scm_helper$(EXESUF) +check: check-block +check-block: $(SRC_PATH)/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))) + @$< +endif + +check-build: build-unit $(QEMU_IOTESTS_HELPERS-y) check-clean: rm -rf $(check-unit-y) tests/*.o tests/*/*.o $(QEMU_IOTESTS_HELPERS-y) diff --git a/tests/qemu-iotests/meson.build b/tests/qemu-iotests/meson.build index 3de09fb8fab..60470936b45 100644 --- a/tests/qemu-iotests/meson.build +++ b/tests/qemu-iotests/meson.build @@ -4,7 +4,3 @@ if 'CONFIG_LINUX' in config_host else socket_scm_helper = [] endif -test('qemu-iotests', sh, args: [files('../check-block.sh')], - depends: [qemu_block_tools, emulators, socket_scm_helper], - suite: 'block', timeout: 10000) -