From nobody Tue Feb 10 16:22:05 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1529092880081123.43687137073823; Fri, 15 Jun 2018 13:01:20 -0700 (PDT) Received: from localhost ([::1]:49049 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fTuuJ-0005N8-Uh for importer@patchew.org; Fri, 15 Jun 2018 16:01:15 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52348) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fTugm-0002XQ-5P for qemu-devel@nongnu.org; Fri, 15 Jun 2018 15:47:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fTugl-0005MV-9b for qemu-devel@nongnu.org; Fri, 15 Jun 2018 15:47:16 -0400 Received: from mail-wm0-x236.google.com ([2a00:1450:400c:c09::236]:52646) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fTugl-0005L3-2V for qemu-devel@nongnu.org; Fri, 15 Jun 2018 15:47:15 -0400 Received: by mail-wm0-x236.google.com with SMTP id p126-v6so5199662wmb.2 for ; Fri, 15 Jun 2018 12:47:14 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id z16-v6sm13180407wro.41.2018.06.15.12.47.07 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 15 Jun 2018 12:47:10 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 165863E0768; Fri, 15 Jun 2018 20:47:06 +0100 (BST) 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=mQkbtycqgecvtKajhSQdJnVmb+umLT7Ikvt2yrGdEKw=; b=YhBMdps9ksXjgzbRPFDgnbRQQnGZiHGzW6ldKgD6XBc1Ih0igkOOUWR+WpulmhNd8Q AuNZra8cXb4FTf+18TV+PavG5RH2lI8L7gdInY5gsRPmvtbPcbGiFv26HwmrHXSVFaRQ a4CwHMmHM7WO7nutmMI+vzjaSozm2lAhERyB8= 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=mQkbtycqgecvtKajhSQdJnVmb+umLT7Ikvt2yrGdEKw=; b=f98cW0a8IYpMjmUyVEtTZPn3PlE12hcB7k2UExMVg7C6MyR/NrwgO/eBJF+p79NpHP W26e56wZOLRyUTS3JCrfgA6oV/vjf73tVBEEeS7/1CWArVVND3N2ygtpvDHZL8H5zg/v nQfqfHET1se9vsF1G8hntTBUMyZzMX9hFsVVM0IDYfsXNVNTw1Vd7T4k7n3R+YHLZj7n sSSk3jA7MrrcoOT+IPWj0asL4xYeAy5QZfVCJbIieEw0pJ/A0bwCJq9kmJgu7hGiOuBO hzhhprGbazfP6HfAuW4tC2+gVBwQp+MF1h5cMzTWC4jfTT47ZK7UJRt+wBxyEqVScPa2 tN/w== X-Gm-Message-State: APt69E0Vv+m2tXGkJwXWI9azynTrPkw299zEr0lgnvhkNOQgPwfQM/vG nb5zc35MgyhJdWszbIYBcr52DoF6NhA= X-Google-Smtp-Source: ADUXVKIy+zyZC95Z+Qo0vrnDMk2X9wngtIdEV01TLopnnF1cBwFPF19Ag0tWkPyZ6pDQ89bl0rrgJQ== X-Received: by 2002:a1c:3448:: with SMTP id b69-v6mr2431580wma.0.1529092033904; Fri, 15 Jun 2018 12:47:13 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: cota@braap.org, famz@redhat.com, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de, peter.maydell@linaro.org Date: Fri, 15 Jun 2018 20:46:19 +0100 Message-Id: <20180615194705.28019-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180615194705.28019-1-alex.bennee@linaro.org> References: <20180615194705.28019-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::236 Subject: [Qemu-devel] [PATCH v7 08/54] docker: Makefile.include introduce DOCKER_SCRIPT X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Define this in one place to make it easy to re-use. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- tests/docker/Makefile.include | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 74fd51c22c..8afb383478 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -15,6 +15,8 @@ DOCKER_TESTS :=3D $(notdir $(shell \ =20 DOCKER_TOOLS :=3D travis =20 +DOCKER_SCRIPT=3D$(SRC_PATH)/tests/docker/docker.py + TESTS ?=3D % IMAGES ?=3D % =20 @@ -38,7 +40,7 @@ docker-image-%: $(DOCKER_FILES_DIR)/%.docker echo WARNING: EXECUTABLE is not set, debootstrap may fail. 2>&1 ; \ fi $(call quiet-command,\ - $(SRC_PATH)/tests/docker/docker.py build qemu:$* $< \ + $(DOCKER_SCRIPT) build qemu:$* $< \ $(if $V,,--quiet) $(if $(NOCACHE),--no-cache) \ $(if $(NOUSER),,--add-current-user) \ $(if $(EXTRA_FILES),--extra-files $(EXTRA_FILES))\ @@ -133,11 +135,11 @@ docker-run: docker-qemu-src fi $(if $(EXECUTABLE), \ $(call quiet-command, \ - $(SRC_PATH)/tests/docker/docker.py update \ + $(DOCKER_SCRIPT) update \ $(IMAGE) $(EXECUTABLE), \ " COPYING $(EXECUTABLE) to $(IMAGE)")) $(call quiet-command, \ - $(SRC_PATH)/tests/docker/docker.py run \ + $(DOCKER_SCRIPT) run \ $(if $(NOUSER),,-u $(shell id -u)) \ --security-opt seccomp=3Dunconfined \ $(if $V,,--rm) \ @@ -167,4 +169,4 @@ docker-run-%: @$(MAKE) docker-run TEST=3D$(CMD) IMAGE=3Dqemu:$(IMAGE) =20 docker-clean: - $(call quiet-command, $(SRC_PATH)/tests/docker/docker.py clean) + $(call quiet-command, $(DOCKER_SCRIPT) clean) --=20 2.17.1