From patchwork Mon Feb 11 13:05:01 2019 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: 1039790 Return-Path: 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=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="TJMVYw+D"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43ymRX1qxlz9sML for ; Tue, 12 Feb 2019 00:12:38 +1100 (AEDT) Received: from localhost ([127.0.0.1]:50013 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtBNw-0003RZ-Fy for incoming@patchwork.ozlabs.org; Mon, 11 Feb 2019 08:12:32 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50663) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtBHg-0007Xs-S3 for qemu-devel@nongnu.org; Mon, 11 Feb 2019 08:06:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gtBHf-0004ED-4L for qemu-devel@nongnu.org; Mon, 11 Feb 2019 08:06:04 -0500 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]:40102) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gtBHd-0003pn-8P for qemu-devel@nongnu.org; Mon, 11 Feb 2019 08:06:02 -0500 Received: by mail-wm1-x32b.google.com with SMTP id q21so17151771wmc.5 for ; Mon, 11 Feb 2019 05:05:19 -0800 (PST) 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=PDoEy3tWqWX2zs5EXNjyUHgCRsrAEehklQidcFOYNf0=; b=TJMVYw+DMOKbiy/JipE5XnA22tK0ElBpnfRWrSk7PRasmF0g3RsBbRB/ryU9YIJxqL MEKtaLc2McsKY5wGzCbrOEb8zFabTF5e5NlLs8W7kEnAMTUk9gNPgWplU0/7ECxUKL9g Y7wBNG7vLt105RwUJGQWDkKb8dX619piSMjnthCR0AL2jBYoJKUmv2wJNkdL2gt5WjK1 rHPkWCM/lIiCPe6Kk50fLmUYBIU6IekzogluGvUA2bIZ2PgzRhNUipdFG75xm2FWukS9 tJxZa+gVXzD+BraDppY/QEjYtv1V9kMaRtQOnRiwTZU2rBTSOtPPIsY7sX/Ns41N1RDw Q5MQ== 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=PDoEy3tWqWX2zs5EXNjyUHgCRsrAEehklQidcFOYNf0=; b=ntmArTh7jQwzcmysV5tnMzhQnhEb/qUf/wqN7R+rZk3KsBGuLzHv1K58JU7tzoaq2F 2oBBYWtWnkAESv1of3LRkLhP1Ty+snFARqeewMrBPKNsG544UABrs/RNwomb7O+6dMxq pGps/KJ+/NFw/FpcNEzPnwOKP0JJg2Pk8pg4svIQyj5lWvAUGc2bdG7a+w7w1wDuJkVr TEH4FcK5G1sm1fc7/G1zHENljO3MANGTAdxPUwG4zeSFyneFiTaCDB2YK9alhqg+tRYM q5UUj+ufiuH1I7L3yYLO/uJoD/TWk4Pk8Ee3yF2o1zsFEehHEO8eaRNwTdMHFsfGgzNm 3Wrw== X-Gm-Message-State: AHQUAub12MTEg7v/nZE0uuB1w0yoFN7ptzUunWPN16+qBeHZVSqvfE2c 9EZmCWOCqDGi3MzpxC0k0gdJGQ== X-Google-Smtp-Source: AHgI3IbNxAliDpalQIHeJUCeN+HpTMmntNYyz3jovB9AWEgt4FZJYMz2U12wnjijHOzEe5WLJWSPLA== X-Received: by 2002:a7b:c3c3:: with SMTP id t3mr9462265wmj.120.1549890318561; Mon, 11 Feb 2019 05:05:18 -0800 (PST) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id x10sm5951355wrn.29.2019.02.11.05.05.11 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 11 Feb 2019 05:05:14 -0800 (PST) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 9E2181FF8C; Mon, 11 Feb 2019 13:05:07 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Mon, 11 Feb 2019 13:05:01 +0000 Message-Id: <20190211130507.8710-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190211130507.8710-1-alex.bennee@linaro.org> References: <20190211130507.8710-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:4864:20::32b Subject: [Qemu-devel] [PULL 12/18] tests/vm: move images to $HOME/.cache/qemu-vm/images 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?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, Gerd Hoffmann Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Gerd Hoffmann It's easier to move around the images then, by replacing the subdirectory with a symlink. Allows to share the images between multiple qemu checkouts for example. Signed-off-by: Gerd Hoffmann Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée diff --git a/tests/vm/Makefile.include b/tests/vm/Makefile.include index a98fb3027f..a58383d263 100644 --- a/tests/vm/Makefile.include +++ b/tests/vm/Makefile.include @@ -3,7 +3,8 @@ .PHONY: vm-build-all vm-clean-all IMAGES := ubuntu.i386 freebsd netbsd openbsd centos -IMAGE_FILES := $(patsubst %, tests/vm/%.img, $(IMAGES)) +IMAGES_DIR := $(HOME)/.cache/qemu-vm/images +IMAGE_FILES := $(patsubst %, $(IMAGES_DIR)/%.img, $(IMAGES)) .PRECIOUS: $(IMAGE_FILES) @@ -24,9 +25,10 @@ vm-build-all: $(addprefix vm-build-, $(IMAGES)) vm-clean-all: rm -f $(IMAGE_FILES) -tests/vm/%.img: $(SRC_PATH)/tests/vm/% \ - $(SRC_PATH)/tests/vm/basevm.py \ - $(SRC_PATH)/tests/vm/Makefile.include +$(IMAGES_DIR)/%.img: $(SRC_PATH)/tests/vm/% \ + $(SRC_PATH)/tests/vm/basevm.py \ + $(SRC_PATH)/tests/vm/Makefile.include + @mkdir -p $(IMAGES_DIR) $(call quiet-command, \ $< \ $(if $(V)$(DEBUG), --debug) \ @@ -37,7 +39,7 @@ tests/vm/%.img: $(SRC_PATH)/tests/vm/% \ # Build in VM $(IMAGE) -vm-build-%: tests/vm/%.img +vm-build-%: $(IMAGES_DIR)/%.img $(call quiet-command, \ $(SRC_PATH)/tests/vm/$* \ $(if $(V)$(DEBUG), --debug) \