From patchwork Mon Jun 18 13:07:05 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: 138932 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp3935971lji; Mon, 18 Jun 2018 06:10:32 -0700 (PDT) X-Google-Smtp-Source: ADUXVKLL+xZrey96Y4viSousQuHT0+nc378CYSNfAyfuFc68Bk8H4LfoYOXRenb8inQ8nn9IVfiD X-Received: by 2002:ac8:26f7:: with SMTP id 52-v6mr10830349qtp.393.1529327432140; Mon, 18 Jun 2018 06:10:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529327432; cv=none; d=google.com; s=arc-20160816; b=GH6+IJQG6dJP6siUumwuEcrV7cVUhOUwBMFrDZoLo/zUlsHwUqj40+yzvmiyDPbaXq zIGa4nPMrFgMt71Gs5ok0PkwosUuBTkpC3JwKy+6azFpYRV0dTRaiWL2A96nZOkJjL30 QQyzQ1Q2UduvzcVLcoGIEXZ1BOSfVoCVZNd5ihqkuAQkSJK9qQpsP7WVY4n0l4BbECyO YRTWxY7N1uNBw1gx9oLF3UgcooSLQK792d0REderbxnVcSwhxgYmT9TBUisxr3IfCRZh nXjTk3pFHt5AH9oFMBRgP0hJW+ae+CaR61098bTob3BWXiR7dandPzQOs8zp9ca7oQnk KEXQ== 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=LTGpoxS3wrYaSQCKGJM+nkeKljcLuJPnENZMVvlZa9U/3W2A3iRYtNFQcJbR1/QE8Y RwHblTWQaOG5hANZg3dMOsxcawq4Z0MPtkV9pRyw82GjHCoRwKfsQsqxzTidVBuT77zH G5U7VtikV2ANl8AFiGOM37B1sbceyQjrSsPsSW3uwd2XptxQ98OYlaGNmp5u9O/OT2xS P5UkFt80s4KfyaGmryjuGjGzsywsyAwHa3VDcWqmYr9mI9aCHZ9Cndt1pqOwA4WWBQfH zim1i4v6zkoziDl+yJlntQPqbmZFDuYpUjM1jhQwPIOaglr4eglYEKjmZJr955mzTrBX lVfg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="arRpnv/C"; 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 i5-v6si2875780qtc.150.2018.06.18.06.10.31 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 18 Jun 2018 06:10:32 -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="arRpnv/C"; 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]:34724 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fUtvT-0008O4-Gi for patch@linaro.org; Mon, 18 Jun 2018 09:10:31 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52427) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fUtsK-0005y5-Kn for qemu-devel@nongnu.org; Mon, 18 Jun 2018 09:07:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fUtsJ-0002eD-GW for qemu-devel@nongnu.org; Mon, 18 Jun 2018 09:07:16 -0400 Received: from mail-wr0-x230.google.com ([2a00:1450:400c:c0c::230]:35107) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fUtsJ-0002dt-9D for qemu-devel@nongnu.org; Mon, 18 Jun 2018 09:07:15 -0400 Received: by mail-wr0-x230.google.com with SMTP id l10-v6so16790189wrn.2 for ; Mon, 18 Jun 2018 06:07:15 -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=arRpnv/CE6N6xQpwn/Pvym1fpQwYj0GapU3vNlv7m1LJr+HzU0yqlV+fUlHA85jO7h sR5NOBk0bZMe1BakZYZewcrPoLf7ckG15bdcIz8tkD7puDLniyMJE9zQ2IDtQI4IlfHc qrnQSgbQioNrqH9x+rmYfDrpc64FErwm+HO8k= 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=XkWP5j6KWw952oGazjHiefrbTp0vtDa00gp33QUrVSijUFRWTqY/jikt+mYusZCoA4 pRXquN4sRenoXWJorJUBrW2O09+mSQIPGMXx0rws0oyuxLntgwxS33L1m3qgE3rYEky7 bdxvh9ui5+O63yR/d/MAASqr6YEdzi6nTqHqC1jQLijokT1P/rwnStK9gwQsMmoc4HvI PYoOPwvEHVBKC2bt+ggQBmo+3rvb6ApWrkWxS0BhFdQX4r6fzwsJKW+RoEGgi70pX5z3 pJ2cEt/ba9mGvpT7/R+Xn1d7+RNkI0c9q+CgVbO3SMPpSI0KDkzgEG2IEE40G+/KKYZZ 2bjg== X-Gm-Message-State: APt69E0Rw0Yiqpi5czlvfceD1SIJV+txBdltThuvKWFjoLZdTlvivYPB SEnp+zA5x0bayiNVUC4lOTLB8g== X-Received: by 2002:adf:a581:: with SMTP id g1-v6mr10874863wrc.233.1529327234247; Mon, 18 Jun 2018 06:07:14 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id j131-v6sm8835745wmb.35.2018.06.18.06.07.09 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 18 Jun 2018 06:07:10 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 8FA053E063A; Mon, 18 Jun 2018 14:07:09 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: famz@redhat.com, cota@braap.org, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de Date: Mon, 18 Jun 2018 14:07:05 +0100 Message-Id: <20180618130709.19730-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180618130709.19730-1-alex.bennee@linaro.org> References: <20180618130709.19730-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::230 Subject: [Qemu-devel] [PATCH v1 4/8] 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)