From patchwork Thu May 17 17:46:40 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: 136176 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp247474lji; Thu, 17 May 2018 10:59:34 -0700 (PDT) X-Google-Smtp-Source: AB8JxZqQhq5Nw/pCNH+jXrzYEw3ooPG0jhrdpOZQ77GogQLVcy7rVg+hq3fI48YzNob0qs32lr5y X-Received: by 2002:a0c:b026:: with SMTP id k35-v6mr2336136qvc.190.1526579974625; Thu, 17 May 2018 10:59:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526579974; cv=none; d=google.com; s=arc-20160816; b=EJQ6S5T9dNxy8NQjz4E2pB8nLtIf5PjIRl5ratLJImvKHHI1dYBHVkCLtNRnG9z79J oGjXlqaWQDAsqmUKshaaIHFrAs2jhvej5g4Ixtg8qBgAes5E+71JI3p+1fvbq3Q2PQdP 6dvYWtbqLjf1KzHFrEUgmDfG8z2bXI3N2qu2oXOMHhc08KG177QNKWbUol9br4GThwgi XNee8jQDfIvsCSL1OB0w7ex5ACt8RT/xzxcWPW2+1lzNeYAARqgr+7D6PzzpdLy+FWIi DW4uqhKm+Q+RnsLS/yhKU7Vcy5NhoYfxDUi8iwpCz94v5ycwHg0A1HUt1jg5NB75561z eHWw== 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=VLjeFZfmcCndw9tBEPTawI6eunbypY8lmY3J13jyG3kUaZIwHxyiorlF1kCcwM5lpU W5AZRB4H/7QvhLn7sQ77FmqbAXRCBkbIiWF8arfdoIpz72ujytdaGvF2sX6R8Vp/gcdi F3gcyVO33tsr8kHtX/fwkKBcZO3N5X/Bs3RDCuATfQ1T59c6lWg4sWPdxAqcKCa7PL4s 5ZpSydOwezcJfNn9tKa8h/eQVS/3LOi5XOEfS3JOS+PwlZh5FfgezVszJSoioQ0S9ksT QBmgQmaWbb/EZmc/4DkClZtWFyqUMnKcIX9znZ79zpxjwCsWv8zt4ZnDCd73o5w9iPlt QEQA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=M8y6Fycj; 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 l44-v6si3462672qtf.162.2018.05.17.10.59.34 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 17 May 2018 10:59:34 -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=M8y6Fycj; 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]:38481 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fJNBe-00073i-21 for patch@linaro.org; Thu, 17 May 2018 13:59:34 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50929) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fJN04-0006IT-FM for qemu-devel@nongnu.org; Thu, 17 May 2018 13:47:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fJN03-0003ZH-CQ for qemu-devel@nongnu.org; Thu, 17 May 2018 13:47:36 -0400 Received: from mail-wr0-x22c.google.com ([2a00:1450:400c:c0c::22c]:37333) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fJN03-0003Z0-5a for qemu-devel@nongnu.org; Thu, 17 May 2018 13:47:35 -0400 Received: by mail-wr0-x22c.google.com with SMTP id h5-v6so6549476wrm.4 for ; Thu, 17 May 2018 10:47: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=M8y6FycjWyXsF7j/B6P5ZYVDxkOjvj5kc1GKColQVYM8QXcajomR4rp9DvSqrSElJ3 mjJWB4qCWR5EnMwBPqT2uXfWgEzq6RCYkwdk8O8kNLeTWJbLwKXbaGJdGhxInHafgQXz 1wDhNCPmGl73HLYx80prwLeCJ6iVWz5bgWjiM= 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=idAwWPXpB0w6daP5HJJOoQFkhpA+37eZ3nmPRL3qe0Kwy9MngSZ5fqO3UdhuMouy7O xBPD9nNWc0R8bnBlK3kL/RyOGi0iOLztWduYwE5UrKKj2gIthOJNhnbln18RIzR8Jvml quVdq6d+Pvz6Vz2T0AyloLU/atzbXIE/DVL4yyTdPkkEXheLFHKtrw8mZoBfJ53mwtGS W+Qet+kJ+V4RFMFJZgcWERCPyJZYcigxoIUaA0c1jZvaZEX2d5jFCFQIFKftxPP8QCpf lNE+Kt8FBVwbFx0bs/qxVZXXOD0ZvTjBU9SH1ouXBZ0SGdEI8vA6UbIDJNa0MAlFlE7g 00kg== X-Gm-Message-State: ALKqPwfX6SyTGtSfQTd2jqyn1wA7HXXoLVVerPvrVLnYnNJyYan1lUts Hj2Hdh33HcfQ0rdwQKLRhGxqug== X-Received: by 2002:adf:d0d0:: with SMTP id z16-v6mr5316971wrh.152.1526579253975; Thu, 17 May 2018 10:47:33 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id n23-v6sm5035721wmc.23.2018.05.17.10.47.23 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 17 May 2018 10:47:27 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id A003E3E0DDA; Thu, 17 May 2018 18:47:19 +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: Thu, 17 May 2018 18:46:40 +0100 Message-Id: <20180517174718.10107-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180517174718.10107-1-alex.bennee@linaro.org> References: <20180517174718.10107-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::22c Subject: [Qemu-devel] [PATCH v4 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 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)