Message ID | 20180615194705.28019-9-alex.bennee@linaro.org |
---|---|
State | New |
Headers | show
Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="YhBMdps9"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 416rtk5kllz9s2R for <incoming@patchwork.ozlabs.org>; Sat, 16 Jun 2018 05:59:58 +1000 (AEST) Received: from localhost ([::1]:49039 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>) id 1fTut2-00045I-EA for incoming@patchwork.ozlabs.org; Fri, 15 Jun 2018 15:59:56 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52348) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <alex.bennee@linaro.org>) id 1fTugm-0002XQ-5P for qemu-devel@nongnu.org; Fri, 15 Jun 2018 15:47:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <alex.bennee@linaro.org>) id 1fTugl-0005MV-9b for qemu-devel@nongnu.org; Fri, 15 Jun 2018 15:47:16 -0400 Received: from mail-wm0-x236.google.com ([2a00:1450:400c:c09::236]:52646) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from <alex.bennee@linaro.org>) id 1fTugl-0005L3-2V for qemu-devel@nongnu.org; Fri, 15 Jun 2018 15:47:15 -0400 Received: by mail-wm0-x236.google.com with SMTP id p126-v6so5199662wmb.2 for <qemu-devel@nongnu.org>; Fri, 15 Jun 2018 12:47:14 -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=YhBMdps9ksXjgzbRPFDgnbRQQnGZiHGzW6ldKgD6XBc1Ih0igkOOUWR+WpulmhNd8Q AuNZra8cXb4FTf+18TV+PavG5RH2lI8L7gdInY5gsRPmvtbPcbGiFv26HwmrHXSVFaRQ a4CwHMmHM7WO7nutmMI+vzjaSozm2lAhERyB8= 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=f98cW0a8IYpMjmUyVEtTZPn3PlE12hcB7k2UExMVg7C6MyR/NrwgO/eBJF+p79NpHP W26e56wZOLRyUTS3JCrfgA6oV/vjf73tVBEEeS7/1CWArVVND3N2ygtpvDHZL8H5zg/v nQfqfHET1se9vsF1G8hntTBUMyZzMX9hFsVVM0IDYfsXNVNTw1Vd7T4k7n3R+YHLZj7n sSSk3jA7MrrcoOT+IPWj0asL4xYeAy5QZfVCJbIieEw0pJ/A0bwCJq9kmJgu7hGiOuBO hzhhprGbazfP6HfAuW4tC2+gVBwQp+MF1h5cMzTWC4jfTT47ZK7UJRt+wBxyEqVScPa2 tN/w== X-Gm-Message-State: APt69E0Vv+m2tXGkJwXWI9azynTrPkw299zEr0lgnvhkNOQgPwfQM/vG nb5zc35MgyhJdWszbIYBcr52DoF6NhA= X-Google-Smtp-Source: ADUXVKIy+zyZC95Z+Qo0vrnDMk2X9wngtIdEV01TLopnnF1cBwFPF19Ag0tWkPyZ6pDQ89bl0rrgJQ== X-Received: by 2002:a1c:3448:: with SMTP id b69-v6mr2431580wma.0.1529092033904; Fri, 15 Jun 2018 12:47:13 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id z16-v6sm13180407wro.41.2018.06.15.12.47.07 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 15 Jun 2018 12:47:10 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 165863E0768; Fri, 15 Jun 2018 20:47:06 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= <alex.bennee@linaro.org> 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, peter.maydell@linaro.org Date: Fri, 15 Jun 2018 20:46:19 +0100 Message-Id: <20180615194705.28019-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180615194705.28019-1-alex.bennee@linaro.org> References: <20180615194705.28019-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::236 Subject: [Qemu-devel] [PATCH v7 08/54] docker: Makefile.include introduce DOCKER_SCRIPT X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Cc: =?utf-8?q?Alex_Benn=C3=A9e?= <alex.bennee@linaro.org>, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> |
Series |
fix building of tests/tcg - last chance to review!
|
expand
|
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)