From patchwork Tue Jun 19 15:43:47 2018 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: 139155 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp5368291lji; Tue, 19 Jun 2018 08:47:50 -0700 (PDT) X-Google-Smtp-Source: ADUXVKIxAALaYMAMPPPyW2qLcpEmrcU7GESwldW2Bln0N+IjCWu3+2nkMS0Lfh6tbUAp0hmMod8f X-Received: by 2002:ac8:1978:: with SMTP id g53-v6mr15881350qtk.282.1529423270676; Tue, 19 Jun 2018 08:47:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529423270; cv=none; d=google.com; s=arc-20160816; b=mP1d7ujE/Dsw6gm7NAyzegd/45hRqPC5On+cNy3J508XVY0EeyJPJzIuLjdrvhOlpc z8HsPRBlb2L7sefvVFn/OU+zikdOMGoxRlYxj+cFHOuwOxnToJhdSkJfe8AN/SZSj+FI SKs4H17f+qHGKJhiuCX9gUIbI4T43u0VmP72MlsOcQoZXUWZr7BuLkOz8u+pqhCIHeRX LWf8bPbMs5K9i6LCAG2xkzNFDlHZdF4gzQ3NQgvvVCXrfsitYQmTB3TgEUswqgzkeq4A iStJwUYsCaiursNOKXnd919hMOkgl8VkNd5vPCoufhahm/2mQFySyu1Cq2eQR1/XJZay vqNQ== 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:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=5VVTw0fG8m6UmpXcbRkfzfrP7U0XZ6514K5UBJebIwU=; b=S7ZBpAr8mc8Ia3XNH9FS7exB0DRu1X11utghi4li6Sm4fT4mwz/LWA2llpNqTrGBpG vBVasfIvX3BvOUXQaOYfKbDEHucsCEvgRmvwJ3RQ6ubDXizvfDyDhH5XN2zYwd+geLS5 K1IvyFL8tCALXh0P234LCM6Dno1RrGvUIfv++Na33Vjfz1/YkPOvA4r5KOunYcSw6Nyk mzDHCQnJKIuGi9WM9V1wsoiwyBuJD4B+aKr6HluSRKqD0djT2oghFpLGtHvuqgJJNvvr 5ticJT0CzecDcczczr96Twl4sFDJ9f2nSs5Xp8SIEekI4BnKKS/0cdu0w/zzYog6Yfrm DnXA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=DkCdA1qo; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id x74-v6si19890qkx.159.2018.06.19.08.47.50 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 19 Jun 2018 08:47:50 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=DkCdA1qo; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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]:43341 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fVIrG-0007sM-2P for patch@linaro.org; Tue, 19 Jun 2018 11:47:50 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35107) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fVIoH-0006Xf-Tc for qemu-devel@nongnu.org; Tue, 19 Jun 2018 11:44:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fVIoG-0006Ou-W0 for qemu-devel@nongnu.org; Tue, 19 Jun 2018 11:44:45 -0400 Received: from mail-wr0-x235.google.com ([2a00:1450:400c:c0c::235]:38739) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fVIoG-0006OK-PA for qemu-devel@nongnu.org; Tue, 19 Jun 2018 11:44:44 -0400 Received: by mail-wr0-x235.google.com with SMTP id e18-v6so154784wrs.5 for ; Tue, 19 Jun 2018 08:44:44 -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=5VVTw0fG8m6UmpXcbRkfzfrP7U0XZ6514K5UBJebIwU=; b=DkCdA1qo8qAblwK0vuuOp/4cxq7Pfm8ecogOlpPW5jRkfSVXR0z0j8VlU55DNJDxbT DBf97ixxiN/HBFXxk2mxa1wNR7/g2JAJf4DAsVEa45GGwH/vFKaC7RWtRoIOZNpUvitl zFWrlftuJDImtIP6yrpqhE7EoM2FDb/9LhhLw= 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=5VVTw0fG8m6UmpXcbRkfzfrP7U0XZ6514K5UBJebIwU=; b=hmFMV8nK6qbEJGpbk29vvevOdllUVPQoAkA7YD7IgPSJJKnPtJnAwcIf7tEbZzu8H/ Lkf1rqcpNIOFbIMqc2Cs5ebufZshMCVKSA+z2UZafiDPu4uTx3BdhCJZCAmFBZSlFXRb v/vbWeu2HT58nlD4SiHeP1eFqW8XzdlKZybuWQ+EvXawrctIexI0/uh/pcjGpQPYgH+4 a9zodPnPP9CzjC/gzeKE1XN3Vgiv4urV7Q6wQYVY0fAZ7z0qs3JDpQ2370od08iukgqn 23+y4ZKd6xCXDPQKmua7IQHdaRhyiMBa8fm92qEPXx6f/IpKIgp8xaoLFVLFS95TZoI9 Dk6A== X-Gm-Message-State: APt69E0XnfcjED/bnxOzO8roAyjPuTN1YKqgWKlGaQ52u0LQ/fJUVSAl WJGwdgYiV5IzONSm/tgBgcF3aQ== X-Received: by 2002:adf:fac6:: with SMTP id a6-v6mr13839723wrs.74.1529423083564; Tue, 19 Jun 2018 08:44:43 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id a14-v6sm198064wmb.44.2018.06.19.08.44.37 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 19 Jun 2018 08:44:39 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 22B343E0930; Tue, 19 Jun 2018 16:44:36 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 19 Jun 2018 16:43:47 +0100 Message-Id: <20180619154435.18898-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180619154435.18898-1-alex.bennee@linaro.org> References: <20180619154435.18898-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::235 Subject: [Qemu-devel] [PULL 08/56] 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: agraf@suse.de, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, qemu-devel@nongnu.org, f4bug@amsat.org, cota@braap.org, famz@redhat.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Define this in one place to make it easy to re-use. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé -- 2.17.1 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 := $(notdir $(shell \ DOCKER_TOOLS := travis +DOCKER_SCRIPT=$(SRC_PATH)/tests/docker/docker.py + TESTS ?= % IMAGES ?= % @@ -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=unconfined \ $(if $V,,--rm) \ @@ -167,4 +169,4 @@ docker-run-%: @$(MAKE) docker-run TEST=$(CMD) IMAGE=qemu:$(IMAGE) docker-clean: - $(call quiet-command, $(SRC_PATH)/tests/docker/docker.py clean) + $(call quiet-command, $(DOCKER_SCRIPT) clean)