From patchwork Fri Jun 15 19:46:19 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: 138771 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp1257313lji; Fri, 15 Jun 2018 12:59:42 -0700 (PDT) X-Google-Smtp-Source: ADUXVKK6T3yoVwCxkBWR0Q5KxkwMRq2LD7LGIe9DTbyPos0lAjtrxHzw3Q04X02P4gVSxypBhT8W X-Received: by 2002:a0c:81cc:: with SMTP id 12-v6mr2670974qve.4.1529092782075; Fri, 15 Jun 2018 12:59:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529092782; cv=none; d=google.com; s=arc-20160816; b=XSdD5lISDcggMIhk0n/J35jWflDge7KWNlyE6fupPwZbb8Q0oagY1FogBc4YuaqugF 9+oE4eFiCS3GUhg26EMQyT7hEMCmDO8x8Nsm8kUseJkVMUSOV3CYK4LtEubVwzk5mf23 MVhGdyOx8B0B6a5REQQlphNkRdqwJSkNid3R+U2/8umGX4Tl+smLf/ycYtQBwbYoZA9N TVcU+8L8+nKkNhM4mLENk5JhaBfGg48M33w4YHscpZUFTBtPsTif8YXu7PCnIxDTcJ// +Z77XjmuiP44Ibo5yD7J1Vi3htc5LBvjtUtASO6m3yE/IplzxUUdzsuc+N7JPlZRiKn5 EK1g== 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=mQkbtycqgecvtKajhSQdJnVmb+umLT7Ikvt2yrGdEKw=; b=t20sOce0qQ+727KIzGbTcOjSf9PMpq810/AZMarRPthXGn23q/VyOFr2f2UNCYkluD 6+i3ytUgFHdwOGZnz6TptOtdEN2ZwN9wycL9VDsNJd2jlgBmT6vNMnVjmAfzgObVReTv VI9ZlG+9K3uYJ+w6BLeGGPW4iuznfcE/znDzQetkE6uGF96gfP3j2rk6Pyav/SrPmigS Fbve5Qv+tdbzpORRrqwxfONrebBb5+YBM4LyB+hriL89AwkIp0xDmIYcOxSzRKND8hp2 2pSRgWaracxAgBB6iEHLgzZLX86hL3vMis0atWYbmQ9Dgn6BidQfzYv4qjTkcunvZnXz YZQw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=YhBMdps9; 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 56-v6si4115393qvv.123.2018.06.15.12.59.41 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 15 Jun 2018 12:59:42 -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=YhBMdps9; 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]:49039 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fTusn-00045I-H1 for patch@linaro.org; Fri, 15 Jun 2018 15:59:41 -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) 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-Received: by 2002:a1c:3448:: with SMTP id b69-v6mr2431580wma.0.1529092033904; Fri, 15 Jun 2018 12:47:13 -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) From: =?utf-8?q?Alex_Benn=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 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_Benn=C3=A9e?= , qemu-devel@nongnu.org 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é --- tests/docker/Makefile.include | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) -- 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)