From patchwork Fri Jan 25 14:00:13 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: 156579 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp395529jaa; Fri, 25 Jan 2019 06:04:01 -0800 (PST) X-Google-Smtp-Source: ALg8bN7aWQaDDrAO8887e2J+ve+0SYgGx2qw4SmgOaQ6J4Tnuk21Tp+jM3vggdDOfXkLt6LPsZfv X-Received: by 2002:a5d:56d2:: with SMTP id m18mr12205385wrw.113.1548425041221; Fri, 25 Jan 2019 06:04:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548425041; cv=none; d=google.com; s=arc-20160816; b=YR6WB3vNkWqZ6GNarCDOMk0ZiJGt2YXsZTvqArQz7En3ByXQmfUrgAyInT1S/9AfRe nITHrJBw9KgoL1Vsx+MUlORKf0YWTH4E5zX86WLOKMn/DIAziKW/mwqg2JuHQc6CYXuu kLdHKuz+GAgi+jKnRdvyBngWKB8tmCOEidKVJnJ7HzGo7JuufvNirL+gh7UN//6Xxc+n EZRxyVLFxEWXJgeReaKx3uBqs1tUl6rz3EUfCvMUf7ck0r33n4lioGdq6j8bfEzQhX2v iOCk/0wsU2pChFX5R87igr/+YfJ+ha/pm2FbtM+6dQTha/2/Qu78Uf/6/2ttjAU8lnjM Gnkg== 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; bh=XWeaDTcp3bKD0qd6jPiiquZiB5T8J8XLLU5Gi2MTeS0=; b=D2oK9zMGfIpIChKRCAbTJiHDNLEfbYbulSGjwHNdnqdqc2rwslK61vC5DQ2Io8NQqq KqRAXl4UzVqSsk7kqsvQwE0IHtSqC7SF/DMalrO+s0l/Jqmml8nkTnLT6T9zD33J44SD hcPRny5xof4jtenBfhPgZvkoAMoF1/P26sgbd0Z6oa61j2sUmgndxnArBBjwhQsTdhS/ 6AtUfhKbFuPFgxZ7o4n0PAcy35EUgfFsNp5W2BL6ooOoJ+hD7AA2vKud7BHXv0f1B37O 4oNqcIMIYcgZHKlNZx2aLFEFPnDEt/++Rr4Lg0ADbxSIg0F3fZ5iqzShtLlZFcv1WxhK YSyw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=LCzp8pM0; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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. [209.51.188.17]) by mx.google.com with ESMTPS id x4si77202274wrr.35.2019.01.25.06.04.01 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 25 Jan 2019 06:04:01 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=LCzp8pM0; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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 ([127.0.0.1]:45168 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gn25Q-0004u8-7O for patch@linaro.org; Fri, 25 Jan 2019 09:04:00 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52107) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gn224-0003VL-4z for qemu-devel@nongnu.org; Fri, 25 Jan 2019 09:00:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gn222-0000gz-5a for qemu-devel@nongnu.org; Fri, 25 Jan 2019 09:00:31 -0500 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:46974) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gn221-0000eg-SB for qemu-devel@nongnu.org; Fri, 25 Jan 2019 09:00:30 -0500 Received: by mail-wr1-x443.google.com with SMTP id l9so10359570wrt.13 for ; Fri, 25 Jan 2019 06:00:28 -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=XWeaDTcp3bKD0qd6jPiiquZiB5T8J8XLLU5Gi2MTeS0=; b=LCzp8pM028jWYhauyg6+Rrw0m4ns+cTp8Z58i+jQwUDeKlMl69my33cijIdF0Xd8ui B+tQ3GK5qouPxAtRyRbt3sdnx1e56S8Qt7ddVbPMAJm2Qhg1t8HWJB/FXAl8c86y2oT2 SSrLq8ryrtoS+LkFZ5R6YPs0ybf6Q/6VOOec8= 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=XWeaDTcp3bKD0qd6jPiiquZiB5T8J8XLLU5Gi2MTeS0=; b=Rv1vlrVPHPm19jkEH7LPrH+riZ7Nxndv8hl9pYax1hKcxWCdv7WinOVYGxtiYWXssO qkmchLtFQLNikJJeOIIOjIp627QvbUgpQdbdIznNibqTWKxoPz3a7PfcuEgcRb0EglGy wZlCtiIYIorNAmchuNExhMmfel6e5RhZsqHZe//HEhPT0gHnGJ7/nwY/wtyKv/zCiQ6g dC2w73NrcYvmTTin+AYUIe99ula5BDvRyAU8Tl2emsT3XeMCx/yVER2MDqpJHEksyjeq D8Vd/BDszzTTN0brkA6xhZMgHpKDIJrjE0VOyg53lDNDbpMosjUX3oguf9E8dJAUrlNc NaFg== X-Gm-Message-State: AJcUukfMnQ0ZQxG7HaMz4ZWmvbVCnbzgE6NJ2eCQIofDotFqkMXnPZOj oc4KRuBHYTnO/qWXMSx2B0q3t5ZJP5k= X-Received: by 2002:adf:8068:: with SMTP id 95mr11873496wrk.181.1548424827739; Fri, 25 Jan 2019 06:00:27 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id x20sm88004727wme.6.2019.01.25.06.00.21 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 25 Jan 2019 06:00:24 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 6B2053E07DF; Fri, 25 Jan 2019 14:00:18 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Fri, 25 Jan 2019 14:00:13 +0000 Message-Id: <20190125140017.6092-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190125140017.6092-1-alex.bennee@linaro.org> References: <20190125140017.6092-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::443 Subject: [Qemu-devel] [PATCH v1 10/14] 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: Fam Zheng , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= , Gerd Hoffmann Errors-To: qemu-devel-bounces+patch=linaro.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 --- tests/vm/Makefile.include | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) -- 2.17.1 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) \