From patchwork Tue Apr 10 19:39:03 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: 133102 Delivered-To: patch@linaro.org Received: by 10.46.84.29 with SMTP id i29csp1636477ljb; Tue, 10 Apr 2018 12:46:09 -0700 (PDT) X-Google-Smtp-Source: AIpwx496FMqPFcPOsKSFqj8w53bjw8v+c1eVmCJdqyYPejMcJOV9ZaLeMnKQUxkcFeoE1cKRxJOo X-Received: by 10.200.83.6 with SMTP id t6mr2834085qtn.71.1523389569532; Tue, 10 Apr 2018 12:46:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523389569; cv=none; d=google.com; s=arc-20160816; b=SDvFLVXdaMdyzFYMNMzZoW3f33WWYtzYzl2tqLd1EFCyJZ5Ms7TBeuuTiW5cFjfGX8 dWLg9Et4pxYBXm1KJwiUSncQEVHynSy5yMmsMj4NfbNfr5L+uVnsvATE14NZ9kUmqdZG YSGlKzBi542tu9YTnGAoVpOZq+cl1tYRJ6Kzu2fO3nh4GCX5ARVt26OyUT3WWdXt4VUX 73EPD0TncvxvCdIK6nMWy0LJo45GItFw0Qq9vSvKAlOoh4lS0evRUA1eBtM59ppmppoJ VfTKXt+9Tgxg+gNSrzjuEK/oKcAAQAY5SBAIeWTkaQi5TyxQdc+zHHtPogL9f3GkOhGf nEBA== 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=NLNNcA1X2opHP8Wsqfkpu7l6GYpfICjh2uBBfBRh/ec=; b=H+SXWzTPYpV5meKFgr9b+yesfRQw3e6J5kjC10uDFf3s0dQidGjE++aDNqGXdUxhzq oOVmKAwPqbUyZPkip7UcY5s0mZuwyYWsGUlHHGSHIEfWzp7f5xJ5fIBCV/DwHYG8pOfM 6UsFQ4RFStRJVkfdmYjdttUj4oVa6EMf45g8LrZgiXRudgOoST7n9tAbDwedK5hAAekk 0D0zjcA4GVSYn8XL4HYueW6OY/WM6McWTKU8HeQjNPz/G6vzo70vP9MQL6HQ8zyAfUM9 Nu+ctEGJhqwBFHDuSmPaAfNLvT5C5j7LknTeS31Y24ogjoQurtjC25W52rBIGcUevgUJ vbSg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=gFS7f2Lt; 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 b201si1812361qkg.318.2018.04.10.12.46.09 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 10 Apr 2018 12:46:09 -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=gFS7f2Lt; 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]:39730 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f5zDV-0005up-1O for patch@linaro.org; Tue, 10 Apr 2018 15:46:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46635) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f5z74-0000Ao-CP for qemu-devel@nongnu.org; Tue, 10 Apr 2018 15:39:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f5z73-0006L4-Cc for qemu-devel@nongnu.org; Tue, 10 Apr 2018 15:39:30 -0400 Received: from mail-wr0-x229.google.com ([2a00:1450:400c:c0c::229]:33787) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1f5z73-0006KR-6X for qemu-devel@nongnu.org; Tue, 10 Apr 2018 15:39:29 -0400 Received: by mail-wr0-x229.google.com with SMTP id z73so13954336wrb.0 for ; Tue, 10 Apr 2018 12:39:29 -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=NLNNcA1X2opHP8Wsqfkpu7l6GYpfICjh2uBBfBRh/ec=; b=gFS7f2LtT1gLzzCPU00EjGDNlQzb8CQm85aT3LvCsTxpy4TXvTyUx7bhlKDivhWljn vsHmO301nO8YtwiV/F+YS+jiUd4jX8h/K3ExQnmniEGtrGI+5Bek3oQPVREoyZ76WNck HaVotWJpENVDu9OwqprjHTg+rwXftZR3fQofU= 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=NLNNcA1X2opHP8Wsqfkpu7l6GYpfICjh2uBBfBRh/ec=; b=IcV6EK09CDPPtmRZXsk6ORtRjIzPeRBDVkFebFBJYPyfIaDn+8F9Ann1zB1kPvmtIz /e/TG7BRv8YW2ITkel2GqgrFBAKnxjbagpNi/aw3HsCaNcaS+ADoiBNi5HqX0oEox0er kurYj28f0l9ulo31tR9MM1PQZNW0uvMzMNhIu6OnGIVixd2ciHxcqJMcvOlWQZQEO6G0 woGw/uuPunJLfZ3qBXbGIjNa7eq+y8xT/X7FDcX2UukXOgOUOuqNnpDCB6tSI35NfGbT fRUUq9GoX0G/G9bXWAGHT+Nx2wumPMhsn3SeJszX2Z6b8Z/fGrsXTNpj7S501yA4S5G6 UIfw== X-Gm-Message-State: ALQs6tBXQ+HldPqN+So0Qokc+zK2pY3mfD/egQh9F7SbpaWFd5EJJDMM Q4+HXxS3oJlBDw8pHiPy7dVYdg== X-Received: by 10.223.142.164 with SMTP id q33mr1268555wrb.72.1523389168057; Tue, 10 Apr 2018 12:39:28 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id i141sm3671585wmd.6.2018.04.10.12.39.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 10 Apr 2018 12:39:24 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 0114E3E0990; Tue, 10 Apr 2018 20:39:20 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Tue, 10 Apr 2018 20:39:03 +0100 Message-Id: <20180410193919.28026-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180410193919.28026-1-alex.bennee@linaro.org> References: <20180410193919.28026-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::229 Subject: [Qemu-devel] [PATCH v1 08/24] 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_Benn=C3=A9e?= , famz@redhat.com, cota@braap.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= 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 --- tests/docker/Makefile.include | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) -- 2.16.2 Reviewed-by: Philippe Mathieu-Daudé diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index de87341528..6a5aa9ec71 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -14,6 +14,8 @@ DOCKER_TESTS := $(notdir $(shell \ DOCKER_TOOLS := travis +DOCKER_SCRIPT=$(SRC_PATH)/tests/docker/docker.py + TESTS ?= % IMAGES ?= % @@ -37,7 +39,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))\ @@ -129,11 +131,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) \ @@ -163,4 +165,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)