From patchwork Thu Jun 21 06:25:17 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: 139458 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp1678113lji; Wed, 20 Jun 2018 23:35:36 -0700 (PDT) X-Google-Smtp-Source: ADUXVKIrF1qXvb/I7aFcWVwtH0+CHQehiC4M45+Z0/AW4Mu5owkwHBjcsFKLIZBbW/R8b50V7QMc X-Received: by 2002:a37:cc5c:: with SMTP id r89-v6mr3898452qki.441.1529562936758; Wed, 20 Jun 2018 23:35:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529562936; cv=none; d=google.com; s=arc-20160816; b=mbp1p6mkajbJaqnZJTiXhI+HSWWo4aEpJZA/JSbnUp7RZb968Srb6fFFTxSyTPB+Cj W9k7YnPt1fscoLtpzAVaeekb4G3FFsz2r5KhHJHGn3WJvlqF2YItfimKVAiNoIQoNRAk 5GDPfD7pAofkBDrqH/6nSIYNesmiHmEvHkq2xbi9aF+SyBJp8+ikm404a4epmsnZq8mU ouYQQiRni+JdyzxLNlBoWZwhHUks534AuF17owBBt0/lKqHcMEsl59psXvnBzWjlpucG vgDK4sOkgQ+WIGUiwDhXSMKnAuSMbJhITID5crY7nbmBjdbFv4zU7ShgNfyBhmBxXZWe PagA== 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=q2Ez1mL7dA8J/aRAIu8nH8dkXzTopRECcRzk2d+5VyG3dC0DFQeXN9J6Xu5YCu+T10 cTxIXMcZZfeJybEk8RxS+gYK8h6zz0xAD8AYp5PXnjILe99e1z++4LXHPyeFpjaY4/3O XJs25SA8ib4VgIIpKKWu4iDaNg8uaoq5PUwDWSNt3NjXVA5z6Dj6/k3YXydTPWDMl8jh HOsA2jzZHQDuSRQALAKrH7uI3IFJAd4bB/IprsHj4GoB0TJX5ez5ELtHgsBLne9GkwuV 1qykvhlx/zZmpMtcfW+REGgkSRPB8VlnrN+zGkGK9v7YBTZa2Xs+b5Xsl+xcGuYQMnpA j+yw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=XX36qfpz; 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 h88-v6si3919022qva.153.2018.06.20.23.35.36 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 20 Jun 2018 23:35:36 -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=XX36qfpz; 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]:53286 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fVtBw-0008Oo-47 for patch@linaro.org; Thu, 21 Jun 2018 02:35:36 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53095) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fVt2t-0000vZ-Tn for qemu-devel@nongnu.org; Thu, 21 Jun 2018 02:26:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fVt2s-0000d4-Rb for qemu-devel@nongnu.org; Thu, 21 Jun 2018 02:26:15 -0400 Received: from mail-wm0-x22a.google.com ([2a00:1450:400c:c09::22a]:55128) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fVt2s-0000bz-Lx for qemu-devel@nongnu.org; Thu, 21 Jun 2018 02:26:14 -0400 Received: by mail-wm0-x22a.google.com with SMTP id o13-v6so3084102wmf.4 for ; Wed, 20 Jun 2018 23:26:14 -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=XX36qfpzfPL0jIuo3VgMVQ0FmtbUtHR8KJLh9o94k6dLnekpN2TLqQ7iNiatJUSzxJ QE1pj+wWmGrPThkBOiN5YtBQoMBgh4dYGVD0EHvK7cLz5QYf02ioIwyaXs5hDRMXoxkG KYR5ygl7CfSl3AGz1rNnQg5LNA2n6x1zdzsis= 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=ufT53iVF9QvveFeWmjX8evsgQKA+K0JXegWhyTyhRkj4z+Y7VFpBbjSJTxgNlq2qUU T8ufHnMpO3Ogt3XMbQDsqnH9nwITPui9fdFqDCCPOaErRAx/W5c/JD2wpPXlPUjuk25B vMMAciN/vMG/7Av76cHctHm29eoHhpVwNouIvFxVkOmxLtsH3OI/8SOQCu+SLFqpCOSt ejKr3kfzxY5zrKmBVOfuMtqzgnuqiztWhXWm99p5n9L+8OFEvujY2HDnC+Fhk+bYWm57 42xPKFnUElPCJHqK4zkoT5C5vWDGb8l6NbSei9SjXrGPODHODNOBHzUpVUCvRY73FYv4 1WBw== X-Gm-Message-State: APt69E0EAVtwE4DX15cyqHSZCf5yIj/maJkBhmFN3IYGdl0AqbrIhDQI a2ywy3MnD/fCkVHfH4EgPn+abR/fE68= X-Received: by 2002:a1c:2d15:: with SMTP id t21-v6mr3754803wmt.42.1529562373656; Wed, 20 Jun 2018 23:26:13 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id e14-v6sm2905221wmh.17.2018.06.20.23.26.08 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 20 Jun 2018 23:26:11 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 099553E097F; Thu, 21 Jun 2018 07:26:06 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Thu, 21 Jun 2018 07:25:17 +0100 Message-Id: <20180621062605.941-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180621062605.941-1-alex.bennee@linaro.org> References: <20180621062605.941-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:c09::22a Subject: [Qemu-devel] [PULL v2 09/57] 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)