From nobody Sun Apr 12 00:55:03 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1772454961; cv=none; d=zohomail.com; s=zohoarc; b=muPcK4Nf11d8krrBndQvP5Ybg0fFtw5LsCAFynmQ0uuPORQOcMC/rkeH/2dpVm15NswIbYQ2gVhNNNf/2rxbeepVqPmp4OT8NecQIFOfOiaDo4XS3snRQohAFvCgWmmnVNcd/iMpBhQ+3l/Bu3SW7YjoWtd0qw5XtijzJDwHF8A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772454961; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Moaiik241QrYgueozeft5pubQVeB2J7L7nFRRkMFbjI=; b=Pl5IG2sW9lG3Rw+/nFg4QtpZ0+hMZeI6u1K+/kVl65l9mrQsVK5f3ca2brggIuA/bgpyjcZUEU5x+zXuM9c7Sdov63ibnoreOCL9w0IC82Ugp6JKpXWEdhl3JW6Rnr5xueaJ4A43Pw5tHbgeic5GE/uJTLv0o3dlICfbJ4i+0kQ= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772454961489193.6736454278947; Mon, 2 Mar 2026 04:36:01 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vx2UC-00055Z-1k; Mon, 02 Mar 2026 07:34:56 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vx2U7-00050d-8Z for qemu-devel@nongnu.org; Mon, 02 Mar 2026 07:34:51 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vx2U5-000614-Em for qemu-devel@nongnu.org; Mon, 02 Mar 2026 07:34:50 -0500 Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-592-4OxE0T_bO-OnpmO1bpUdSA-1; Mon, 02 Mar 2026 07:34:44 -0500 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 6930F180034A; Mon, 2 Mar 2026 12:34:43 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.45.224.162]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 8CE7A1956053; Mon, 2 Mar 2026 12:34:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1772454887; 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: in-reply-to:in-reply-to:references:references; bh=Moaiik241QrYgueozeft5pubQVeB2J7L7nFRRkMFbjI=; b=UAd7v05YydWWQ1V8eJ03+ltixmRJsYafdV0kmZBEUFHdb5tSu+ha4AN/lq/IEutJc4UxNB 3x2ktsRWvzbYRfoFtyP90hOaxsBfbuEZoj8nc07HoRm+FO3PduRYPYwHwccoWDyETlM13E BZihsbvkM3ZOCUlTufDJwp8iYVEVisw= X-MC-Unique: 4OxE0T_bO-OnpmO1bpUdSA-1 X-Mimecast-MFC-AGG-ID: 4OxE0T_bO-OnpmO1bpUdSA_1772454883 From: Thomas Huth To: Peter Maydell Cc: qemu-devel@nongnu.org, =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PULL 09/10] tests/docker: allow display of docker output Date: Mon, 2 Mar 2026 13:34:12 +0100 Message-ID: <20260302123413.274700-10-thuth@redhat.com> In-Reply-To: <20260302123413.274700-1-thuth@redhat.com> References: <20260302123413.274700-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 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=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -5 X-Spam_score: -0.6 X-Spam_bar: / X-Spam_report: (-0.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.968, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.495, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1772454963339158500 From: Daniel P. Berrang=C3=A9 The --quiet command is used with docker unless V=3D1 is passed to make, and as a result stdout from docker is never visible by default, making it hard to diagnose failures building / running containers. Meanwhile passing V=3D1 is undesirable as that makes the entire build system verbose. Introduce a $(DOCKER_V) make variable which is initialized from $(V) It is thus possible to display docker output without also enabling make verbose output. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Thomas Huth Message-ID: <20260210163556.713841-4-berrange@redhat.com> Signed-off-by: Thomas Huth --- tests/docker/Makefile.include | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 7d4582b6a8d..df14538c0f5 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -23,6 +23,8 @@ RUNC ?=3D $(shell $(DOCKER_SCRIPT) probe) CUR_TIME :=3D $(shell date +%Y-%m-%d-%H.%M.%S.$$$$) DOCKER_SRC_COPY :=3D $(BUILD_DIR)/docker-src.$(CUR_TIME) =20 +DOCKER_V ?=3D $(V) + .DELETE_ON_ERROR: $(DOCKER_SRC_COPY) $(DOCKER_SRC_COPY): @mkdir $@ @@ -40,14 +42,14 @@ docker-qemu-src: $(DOCKER_SRC_COPY) docker-image-%: $(DOCKER_FILES_DIR)/%.docker $(call quiet-command, \ DOCKER_BUILDKIT=3D1 $(RUNC) build \ - $(if $V,,--quiet) \ + $(if $(DOCKER_V),,--quiet) \ $(if $(NOCACHE),--no-cache, \ $(if $(DOCKER_REGISTRY),--cache-from $(DOCKER_REGISTRY)/qemu/$*)) \ --build-arg BUILDKIT_INLINE_CACHE=3D1 \ $(if $(NOUSER),, \ --build-arg USER=3D$(USER) \ --build-arg UID=3D$(UID)) \ - -t qemu/$* - < $< $(if $V,,> /dev/null),\ + -t qemu/$* - < $< $(if $(DOCKER_V),,> /dev/null),\ "BUILD", $*) =20 # General rule for inspecting registry images. @@ -73,7 +75,7 @@ docker-binfmt-image-debian-%: $(DOCKER_FILES_DIR)/debian-= bootstrap.docker DEB_TYPE=3D$(DEB_TYPE) \ $(if $(DEB_URL),DEB_URL=3D$(DEB_URL),) \ $(DOCKER_SCRIPT) build -t qemu/debian-$* -f $< \ - $(if $V,,--quiet) $(if $(NOCACHE),--no-cache) \ + $(if $(DOCKER_V),,--quiet) $(if $(NOCACHE),--no-cache) \ $(if $(NOUSER),,--add-current-user) \ $(if $(EXTRA_FILES),--extra-files $(EXTRA_FILES)) \ $(if $(EXECUTABLE),--include-executable=3D$(EXECUTABLE)), \ @@ -105,16 +107,17 @@ debian-toolchain-run =3D \ $(if $(NOCACHE)$(NOFETCH), \ $(call quiet-command, \ $(DOCKER_SCRIPT) build -t qemu/$1 -f $< \ - $(if $V,,--quiet) $(if $(NOCACHE),--no-cache) \ + $(if $(DOCKER_V),,--quiet) \ + $(if $(NOCACHE),--no-cache) \ --registry $(DOCKER_REGISTRY) --extra-files \ $(DOCKER_FILES_DIR)/$1.d/build-toolchain.sh, \ "BUILD", $1), \ $(call quiet-command, \ - $(DOCKER_SCRIPT) fetch $(if $V,,--quiet) \ + $(DOCKER_SCRIPT) fetch $(if $(DOCKER_V),,--quiet) \ qemu/$1 $(DOCKER_REGISTRY), \ "FETCH", $1) \ $(call quiet-command, \ - $(DOCKER_SCRIPT) update $(if $V,,--quiet) \ + $(DOCKER_SCRIPT) update $(if $(DOCKER_V),,--quiet) \ qemu/$1 \ $(if $(NOUSER),,--add-current-user) \ "PREPARE", $1)) @@ -231,7 +234,10 @@ docker-run: docker-qemu-src -e TARGET_LIST=3D$(subst $(SPACE),$(COMMA),$(TARGET_LIST)) \ -e EXTRA_CONFIGURE_OPTS=3D"$(EXTRA_CONFIGURE_OPTS)" \ -e TEST_COMMAND=3D"$(TEST_COMMAND)" \ - -e V=3D$V -e J=3D$J -e DEBUG=3D$(DEBUG) \ + -e V=3D$V \ + -e DOCKER_V=3D$(DOCKER_V) \ + -e J=3D$J \ + -e DEBUG=3D$(DEBUG) \ -e SHOW_ENV=3D$(SHOW_ENV) \ $(if $(NOUSER),, \ -v $(DOCKER_QEMU_CACHE_DIR):$(DOCKER_QEMU_CACHE_DIR) \ --=20 2.53.0