From patchwork Fri Jun 8 12:32:26 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: 137981 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp839829lji; Fri, 8 Jun 2018 05:58:41 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJPA+pxCQqiYaUcU7LekCNMz7EKxN6tHAbghE+vU32wAiXe4IQwvbB9pHJbPUCXX0qccHhu X-Received: by 2002:a37:4ecb:: with SMTP id c194-v6mr5130972qkb.151.1528462721864; Fri, 08 Jun 2018 05:58:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528462721; cv=none; d=google.com; s=arc-20160816; b=c+0Eem7cGSvhQAV1Bg4KRA66M94UEYwp7DfGFh5zYd0lAtT6UWqmByB9iKdGoho9bF y6LG2u283OsBszTg0k4dupcQ0SvEWkAAgP3l4hyUoLiNWIW6bTHqUYxNmPRydhICXtbA zaGjKE+3MHiBz/kP9x4eGriz04GM9NpOSPUjoUxuITcvVvmBAJi/+LprBUXCjYaKbeXn q+sPwZK8oMu5mky1tjpkauO1bJ3/+3uKnVt0gqxvT0FdRCLmxY9KKmmDqBG+XCRR9LYC vLxGdIK/BJuvFHpFWOhWpBZtw87QtjdNvSWYwInsPQC+bp34+iD3EDr2XS26zthPsz3w IFGA== 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=pgHcdv8iQ+5IFHykgA6sITi+R0yx7gV2G4R+RX6q6GvfFDKJbGoEbnCryWe68uMWsb v3DGhM+CEdwSfan1ndVSUg1DoXYHMAoCKgCh/9K48rr7NHOK1LsE7uxiFgFJR4mkC+P2 8ftrvzOT5mMbiy3DaPj8niAj3LTUwn2GmDYwUeMA3iBHpj/V+v+X4EXd+VXxkBcz/HD+ 5ovgft8Iz5uOXD2AoOQrkDPxOhDFOMW8oGsDN9lF3HJYKlMzGGSyAGcBs8nGLaUpQkmU 7564avy4VpnUhzrz1DDp3OIUkRtD5N03wWmU8M1wQ5k4L82XqAnCSIYxzj+26KduQEuk 0eSA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=jhNGBxCn; 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 i49-v6si2519654qtf.45.2018.06.08.05.58.41 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 08 Jun 2018 05:58:41 -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=jhNGBxCn; 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]:35497 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fRGyX-0005QW-BD for patch@linaro.org; Fri, 08 Jun 2018 08:58:41 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46664) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fRGZx-0001BG-7r for qemu-devel@nongnu.org; Fri, 08 Jun 2018 08:33:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fRGZw-0006DG-8K for qemu-devel@nongnu.org; Fri, 08 Jun 2018 08:33:17 -0400 Received: from mail-wm0-x22a.google.com ([2a00:1450:400c:c09::22a]:38006) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fRGZw-0006Co-1z for qemu-devel@nongnu.org; Fri, 08 Jun 2018 08:33:16 -0400 Received: by mail-wm0-x22a.google.com with SMTP id 69-v6so3418549wmf.3 for ; Fri, 08 Jun 2018 05:33: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=jhNGBxCn/2eHW4qCAEQ2jXGJrxcpeEDDuaNeAEfOSCq0fBnWGghL5GYxOBdTfTfsy+ 3wZmw5rJ27lUDWjc/+LwRX2dNeMYWpWciOYXKfdhUl3Umhrze75YHI8GRt2gO+cY6qgf yu4PPwTsWs9frMrG43KQWinzBGaKsqhXOglAg= 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=H4zoyhr8NNKwT2nweA2n45NmK4i6gs8Q5BlisZg2nCPr+t1BteGA2YRxxT37vNQf/s y4wshpeNCo7LkWQ+A27835ojRYYt7ix+97i1e+rMH+WR1NWBi7q9zWzyOxUasUYFZG7z RkiMSDUORWtnDQMdMZxG/ULA1fuIpGJoXW5Ip64uLOhb+Msc9SDm2xB7tFqorutkmHeL /pxf+TN2zJlLXYCHywulS2QKSDraFVPyCmCBR7KRvXQ8qPSba7RtzC/bfCJqEeH36LWv 08VvFak/4lM8bH6epYgduqvliSMUhsult0Bces/mnS8NaJ0ajN1jG/9gzFwFqbOePjdP OyHQ== X-Gm-Message-State: APt69E1qBmFYIcTBt7pfMB4AZaGd7xqiggy+ERIhklhQ4IPsckRQhJZz YN9EvCw9Vh7dkpCgtNXYJOuTmQ== X-Received: by 2002:a1c:40d4:: with SMTP id n203-v6mr1399649wma.101.1528461194976; Fri, 08 Jun 2018 05:33:14 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id u11-v6sm2077951wrq.68.2018.06.08.05.33.09 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 08 Jun 2018 05:33:13 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id B24A83E041E; Fri, 8 Jun 2018 13:33:07 +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, pbonzini@redhat.com, stefanha@redhat.com, stefanb@linux.vnet.ibm.com, marcandre.lureau@redhat.com Date: Fri, 8 Jun 2018 13:32:26 +0100 Message-Id: <20180608123307.24773-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180608123307.24773-1-alex.bennee@linaro.org> References: <20180608123307.24773-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:c09::22a Subject: [Qemu-devel] [PATCH v6 08/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.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)