From patchwork Thu Apr 19 13:58:29 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: 133795 Delivered-To: patch@linaro.org Received: by 10.46.66.142 with SMTP id h14csp702402ljf; Thu, 19 Apr 2018 07:27:19 -0700 (PDT) X-Google-Smtp-Source: AB8JxZo366C5xiQ96F5osB0I9hrT4eFp6VlpAjkVFHPyjEdNtUSAXNKr1WmsHHGfWmMyFeWH+IeK X-Received: by 2002:aed:36e2:: with SMTP id f89-v6mr6550721qtb.6.1524148039565; Thu, 19 Apr 2018 07:27:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524148039; cv=none; d=google.com; s=arc-20160816; b=WgY3FUk6OfXEeCrDX4ytjVU8tqxue+3rKzpR6WJQHa851ObYF2k0pcUhjG3Mwwc4e3 Uo7Pt3kTfwZnxT3qzUUbE4nDG0ew4kDF+buZ0ODYhYQlUavxYeOJv406u0jy0UKWCHYm OH6twH85g2kDc9erHrzNmG4sT9iTJUkiZivKPzs2v2x5MVIqMtuUKyXNOaxD/AC5Lr/e m4VBI4K+EFyCkQ3ARyFHcs3SOKV5XgvthkRNSwD3zdcSX3LcbssQXY65IkxQZe8To+YY zyfI80oDgvvdXZObhzSMysa/XILaPfbJWw9zl/sPQEa6yRnXJ5PYTYiQPvkma3t+oyjl 5Q6w== 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=Txa5dWaw6rpku3w/i3TgIXvc5LO3CkoCTj1w4cH/zrg=; b=JSHTjZvIPYh1YuIdqcaUGrEY+Zi6loykF6Z70JxKGansONqA3Q7QZ3mJBPbBf75WPI 0RJc9TK52O5KL3WzH1SYbxGKb8cQ1aLzDHAEjfLyyKZShaJiYLSdmHU5d+Ruoc14ZSyf qZ2Pv6P2Qn7q2lprGfRI2g6UBxSFL1kIx6fiS8J5H3O75sPNBAu9zhZKxI9EARNSaGB1 akyY1goO1szxp4RiSpZrDoBumndh0+gYHLhjZykcIfhic6m4B10oXCxY7KU3VLTgdAWe iYFD3aAE16dTGQrd9xzT5RrVHDpziXtecbeOpAeGhi2TSjTSqbFAvP6KS70YlYopHToh /t/w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=DOz3hJ+b; 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 t64si178934qkc.71.2018.04.19.07.27.19 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 19 Apr 2018 07:27:19 -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=DOz3hJ+b; 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]:50750 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f9AWs-0007Y1-UD for patch@linaro.org; Thu, 19 Apr 2018 10:27:18 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47214) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f9ADq-0004TP-Ii for qemu-devel@nongnu.org; Thu, 19 Apr 2018 10:07:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f9ADn-0004zX-Il for qemu-devel@nongnu.org; Thu, 19 Apr 2018 10:07:38 -0400 Received: from mail-wr0-x22f.google.com ([2a00:1450:400c:c0c::22f]:46197) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1f9ADn-0004yt-CU for qemu-devel@nongnu.org; Thu, 19 Apr 2018 10:07:35 -0400 Received: by mail-wr0-x22f.google.com with SMTP id d1-v6so14417992wrj.13 for ; Thu, 19 Apr 2018 07:07:35 -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=Txa5dWaw6rpku3w/i3TgIXvc5LO3CkoCTj1w4cH/zrg=; b=DOz3hJ+b1MHJtzZvc60fCxjIOfZCbuOflnHLR1ViOqXbYpAATTeAJhc6tGKzui6b0P Z1mjfhUKB5d03mCvYFSN2sezm/9OTg0ZCU4XcuDxNOFkLsWxtukh+q9iXvxDWocBm2OT bHr29yxhqvhTYM0mwxCB38s+I+UjcZ3Ow8Lvo= 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=Txa5dWaw6rpku3w/i3TgIXvc5LO3CkoCTj1w4cH/zrg=; b=uWPll3BjBYrQibi7vECxzHjkMSS240ENK4lPAvEtTO4YKJePe/yOTsOSUWFcuEOs63 EZeJPUVGnJ+w2R+6SbeS2LgkqhYTn7PZBVxYB6p5jpSZUc/6vGCZq1hV3t6XO+PCciWO P55Zyw6gwc7NknUmCVkcG6FcDFKvUodQY0/+KGBiEDlszPIYENLKu7HitK005zIpklLz PlGV+lI1pD4ri5ctXrSJREFh/lhAHjwhPhuDNVJbPRlpEzIKYBjXcqWEkwvCCdZ44eQs RODV16WTGZ2vqslNVr+fgFFAGw2OBBUDNC8Q8rRceKOQR6r9ZaXFjnTnhYTmDVoAz/be 0xdQ== X-Gm-Message-State: ALQs6tCtcv4JpHCN5rvakNo6tE+B6o9oS+dZdZqnODsap2Zls2ckqHYL iHCD+C0DrK7pmhVnbIuL41QmnQ== X-Received: by 2002:adf:91a2:: with SMTP id 31-v6mr5145887wri.124.1524146854283; Thu, 19 Apr 2018 07:07:34 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id e185sm4750684wmg.5.2018.04.19.07.07.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 Apr 2018 07:07:30 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 5A5393E0410; Thu, 19 Apr 2018 14:59:02 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org, 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: Thu, 19 Apr 2018 14:58:29 +0100 Message-Id: <20180419135901.30035-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180419135901.30035-1-alex.bennee@linaro.org> References: <20180419135901.30035-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::22f Subject: [Qemu-devel] [PATCH v2 11/43] 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 Reviewed-by: Richard Henderson 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)