From patchwork Fri May 25 13:38:13 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: 136882 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp3607194lji; Fri, 25 May 2018 06:42:16 -0700 (PDT) X-Google-Smtp-Source: ADUXVKIcWKuKNPu/l0rE7HwRwvbD6h+YRkncnoHmVB9o0ml2pDCWr+FJujIf5JwkcuFkdTDB2OJ6 X-Received: by 2002:a0c:ace2:: with SMTP id n31-v6mr2201504qvc.162.1527255736648; Fri, 25 May 2018 06:42:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527255736; cv=none; d=google.com; s=arc-20160816; b=mZxGvYpbMdvwz4I7CuDTOyYlt4MfNxYWupICmb2JSy/xZV8Ew1JUXCqrVA5BnzH81f AcrF/VqmXq2eEFv3epPBw3Yo8r0xoCADa5Iktv0NDo5ZHPNxiDFQpA4x+81Nkgp5Cj6e w0mfbEHYjo2EQqJePZ+2S1b15Mt6Twr71OgDYLRY2sHzHqC0VZLIUsmOL2QsHK+lpen2 33E+dHGqLLiQNjxyIZRBYqVMJwB2EnC4QsakMdOn5/quEza9GaY7IR+AYFxQiFD+Ozgf GtI3rHFTOIhWWe9VmjvN0qi5xEbUOXlb9WUXeOCJaiyJjtFK4PE5pR9GdCJYUsLDghfe gfdA== 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=zMjGgwUvghL/iSdazcr0kbCiGKNleebXjXP7mhSEZfg=; b=IGz/JlhJIrhwj4Z+FC1IeWo9bX7FbXT+alzwA/C+aH5akWimVeKtOfCquKChdyJ7p9 JBu7R1S436uEd8y0wok+oaAbfx4J4EkAxxkuDNkyqKn8gBW2j8j+EhvpD8IE0H4fhPXI CBxPoS86m8J+VGfB4iwUN39cAaR+COvDExl0yzylcaKuRERf3JFq2WXbDuIzbUnmA/Vp HoyA8HlGbdDaT7nqQQFCWaFFeooU1GeExPH3uIAkaGqqV2+RBGgNK9eFWD7tR9ADZVtq uCYFWlV/nIRb8nU073cns7S10RMWFhotsA5s5Iuig8Jjf3OnplZC4B7W8ZrRE+3lybXJ lzig== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=PqAKSKiM; 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 e7-v6si510254qvo.64.2018.05.25.06.42.16 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 25 May 2018 06:42:16 -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=PqAKSKiM; 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]:44059 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fMCz2-0007h2-38 for patch@linaro.org; Fri, 25 May 2018 09:42:16 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34382) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fMCvz-00051G-Qb for qemu-devel@nongnu.org; Fri, 25 May 2018 09:39:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fMCvy-0005xQ-Lc for qemu-devel@nongnu.org; Fri, 25 May 2018 09:39:07 -0400 Received: from mail-wr0-x22e.google.com ([2a00:1450:400c:c0c::22e]:45991) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fMCvy-0005xD-Ex for qemu-devel@nongnu.org; Fri, 25 May 2018 09:39:06 -0400 Received: by mail-wr0-x22e.google.com with SMTP id w3-v6so9301712wrl.12 for ; Fri, 25 May 2018 06:39:06 -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=zMjGgwUvghL/iSdazcr0kbCiGKNleebXjXP7mhSEZfg=; b=PqAKSKiM86z1S0PtiucIZp6tcWBQ6TIdbjZ7jj1uzCWc/B5dSRwH7wZBD7HJyrKsU5 NJw0g7zEhzKusX5ka1LOWa00bE3nHKcn1fuAH9Hjo+Z0TNhGJYUI87p+iJAVcOQ5jssD he+WG1mx/TFltMi1mU9yjw08usYWOkzlZZVWQ= 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=zMjGgwUvghL/iSdazcr0kbCiGKNleebXjXP7mhSEZfg=; b=GfB9CMhkdgCcH0RiDadA7aZ0XFb357t3zp5hpq5mhDlkm96inutUDg9mHvMGODQ4zu WXL+ENqgNoHrLolyEMJO1Ry/34ISM/HtQwolIzHGWrF6jFab5DB3+LJAy0TDnklWcaSW /Q60cZ38LOgd0oSIDRSVAjRtIlWkxuBENURxj7D4NZsPJ0SFdOG3H5DfMpH3VgYbO0L+ YB/D1hGR8LHrTYzb3wFkuHbDJ1xEaZUm2RoORpACVKFYlowClFPsCqJq9a4Mb/Vht9jf M/Zoogd9kfgtbDqb6WJpqg8ABeZL7wVD4ex55Ip8oR4XBw8H/YQ3FnebYW3UVJ0BZECE kAAA== X-Gm-Message-State: ALKqPwe6su619EYuJY/QbaopVCXzCWZr+xyAIyBx2C79OL5Yvc4Dg8Eu ucZA+dRA4Q61WQbXzvzGbIk4DA== X-Received: by 2002:adf:f801:: with SMTP id s1-v6mr2429208wrp.63.1527255545332; Fri, 25 May 2018 06:39:05 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id v196-v6sm6897811wmf.36.2018.05.25.06.38.56 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 25 May 2018 06:38:59 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 247E23E07C2; Fri, 25 May 2018 14:38:52 +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 Date: Fri, 25 May 2018 14:38:13 +0100 Message-Id: <20180525133851.27161-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180525133851.27161-1-alex.bennee@linaro.org> References: <20180525133851.27161-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::22e Subject: [Qemu-devel] [PATCH v5 11/49] 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.0 diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index ef1a3e62eb..b56386f49e 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)