From patchwork Tue Apr 24 15:23:30 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: 134121 Delivered-To: patch@linaro.org Received: by 10.46.151.6 with SMTP id r6csp2387390lji; Tue, 24 Apr 2018 08:39:28 -0700 (PDT) X-Google-Smtp-Source: AIpwx4/xauoVnXA+TioXzp6K3FQdoToWHC8QhPoWU0zHra/kU23F/eyWZLftbjmGLDSGEBE5S0n9 X-Received: by 2002:ac8:1b43:: with SMTP id p3-v6mr28486626qtk.254.1524584368115; Tue, 24 Apr 2018 08:39:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524584368; cv=none; d=google.com; s=arc-20160816; b=qcLO5xA0JWJgWDdllZDd5zO1JDvqDGxq5UQIIG56/duUcjfkB2zTNnth5toX9MWye9 GpiH8QcpwB4Mn1f9nzAoNxfq2Gu6Yuu/KHLRig0++BfbshiIYWyvVIhl0oSKSdRY3IFD s1lX/cM6z8gThwqDg6sSB8UmK4iBoQcTjWLcM/JujJ6PVCK0cCcEUrF8n5ern/+ElvjG mu+DTLKivMxQHVeMOOqAa3QgWLdLVpgXfRwzUowgOAtLosAo02njiFTn5DPmlvnFg8zY IWl1Ak1iUPMvBQ+UTy2zOJRw4E02B5IKhYhX6GI3gczYvXtnkVUxcrpIz0cHfyRyodNp hSjA== 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=NxCgYxEuFaQ4ys9+wDTD1dOvLwzxRYYq9AscEGQfEBna5XK8YzyhICJ19imUeILOuE 65dJ1dQyMPQZ+FDVw/VYbHTNw6LE6nYTkg2+1tcafg0jb5VzzWC/k33NhEJflN9RJhk6 /38E4GQPvlFIVOus5wBSefsIt11ntNMVd0Vi8C6eFKzUm/wA8uDHldML/fC3xkqXvvuB kgi4jhVX9SS9XSj6wksbQp1wBV8o6wJ8JQMgXCtGvPb2Zm3TpG7bVJEWYnf9qEKVn5+6 aR1ubEIDQHmEIu6L7CowNVDN6PfqATfRopyh/bHX3uWfLEocqjf4mNJmXGrKJPRwjjxE 0k/A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=V6oEtlPs; 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 23-v6si1343587qtx.267.2018.04.24.08.39.27 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 24 Apr 2018 08:39:28 -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=V6oEtlPs; 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]:59152 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fB02R-0000zA-H7 for patch@linaro.org; Tue, 24 Apr 2018 11:39:27 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46973) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fAznp-0006dD-9H for qemu-devel@nongnu.org; Tue, 24 Apr 2018 11:24:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fAzno-0005af-7N for qemu-devel@nongnu.org; Tue, 24 Apr 2018 11:24:21 -0400 Received: from mail-wr0-x234.google.com ([2a00:1450:400c:c0c::234]:42963) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fAzno-0005Yt-1K for qemu-devel@nongnu.org; Tue, 24 Apr 2018 11:24:20 -0400 Received: by mail-wr0-x234.google.com with SMTP id s18-v6so50360486wrg.9 for ; Tue, 24 Apr 2018 08:24:19 -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=V6oEtlPsP7/ZffwZrgG/FWzOiA4Ia22ClHxNhibTDyOeZ1fP4D2V6g2XDMYaPaKZjc TWXVXKp8mRvGkIZQGBZkUIZ51F5bs9ZPOgr810sdxU7RupUMMA5flqZqwIURrA9eUxPH owQHv9fi1s/Pu/iPKC/eaUFc6y8ImCkGYm1lE= 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=P4Jcl3wHXEITt6DCqlyxrQoSAClTesOV7b2DhSN27JVW082ryRhYy5OWaLEKbb7G4W Oh+NtVhPxj33Ti1fEOTJdweAxWYVnMV67DImg0OB9LOIJBzEIwp2kCzvSGB7D6ZQjqyT pa+Qdl8jULQIIHLDPNIqlChX1Zl6OV4oCfLxUKt+LSlGUYCxENp4mOLfKbmbb2N6Eprx onVdy2U9hw3C0s4Lo39se21v6DpxO3LMKoJg9L8dvsb3pStj/52uQb6MFT5e4H6SrowE OygJ6IjFwt2qSs6O2zn5wsO7wATzFqBLZqTZE/eDZ0sd++x2RuQ7MA8Kq9b+Ky0S/oxO NC9Q== X-Gm-Message-State: ALQs6tAQ74PPrU1Gp1lacqfQaAq6ds1y3CZBzOnGPKF0g4F1XBFBkkVe ZqdN/N1arHjSZfp43e6zJ5JMSA== X-Received: by 2002:adf:d207:: with SMTP id g7-v6mr20486046wri.59.1524583458975; Tue, 24 Apr 2018 08:24:18 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id k184sm8903706wmk.21.2018.04.24.08.24.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Apr 2018 08:24:13 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 3B8A43E0A07; Tue, 24 Apr 2018 16:24:06 +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: Tue, 24 Apr 2018 16:23:30 +0100 Message-Id: <20180424152405.10304-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180424152405.10304-1-alex.bennee@linaro.org> References: <20180424152405.10304-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::234 Subject: [Qemu-devel] [PATCH v3 11/46] 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)