From patchwork Mon Jun 24 13:43:36 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: 167589 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp4266185ilk; Mon, 24 Jun 2019 06:59:32 -0700 (PDT) X-Google-Smtp-Source: APXvYqzZUrdDfbDnXP2hAIyHUlJYTmkE7RQ3yQgyh9usg0He196URoLHCvjWrOckeAR6o7py6JQS X-Received: by 2002:a50:f599:: with SMTP id u25mr133662664edm.195.1561384772349; Mon, 24 Jun 2019 06:59:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1561384772; cv=none; d=google.com; s=arc-20160816; b=a2FnS5IkPwH2IzKCo1LNrmegvPBottHo/K/m1boF5l6/MvbLV8ZG6mhx9uqwLMpM10 iWmHPfkKEFMqH1fjeQOS1EfZSx5NFP7nXIRgFGUbjnUiipebauxQipJT6/H8Q+uf9eGM VuLjvo6oR6N9Ka7xZw8PLZwGmlPL/9nbceAE0J1G+PRlTm74E/Yh3HtP4LFxawLZD3/D OwxZF0noCaQ6nocXQJr/qSXutF2lNcbYuJaNX77TLy/oSJDV9sGI1XMu1clWwHcfq51y 1cbmpxq4DsPFxzV8hq3FMdgTHmragHDUv6wdRa5rY2+txC4nCPUlcSumfgIK3pagggm2 Wh+g== 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=Q/rV4H+M74u+dhawBtWuITzFuv6kQ3ZswIz8UU+IjNo=; b=yFGGR8OjLm5spnf2VAJlo2zTMcntzpr36ZT/lZMVDlC0P0knkCL7nrLcG/Ndkw89rM CsOttlUUJ1KhJe/SlmYv5JpbvUecBkeFYGZng1swP4MH+8Ewp8SZgvAQ/UJp1NlLrdQk MHojo0ySQhYqd4h1N4FGplyc1IHIZebqN3dbHKcE9heVc3HW5YXTtVBstG8KCzDI/YTd 9C7OmbhEOpEjaT2trBljL412T6jqYFmiovByqHlkxoMv5qxPh5PGfLVOK3TkThbANAed aQPEN1BBv12dDSo2Y5CZVJ4KFHonDl1OYPM/kYECT+a6mYpnhnZGgLjW0pXTrfmcV3iN c9bg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="rB/3XN8x"; 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 s51si9786496edb.243.2019.06.24.06.59.32 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 24 Jun 2019 06:59:32 -0700 (PDT) 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="rB/3XN8x"; 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 ([::1]:51404 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hfPVL-0004Lk-9O for patch@linaro.org; Mon, 24 Jun 2019 09:59:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41589) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hfPGJ-0006jD-9s for qemu-devel@nongnu.org; Mon, 24 Jun 2019 09:44:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hfPGG-0007gE-PC for qemu-devel@nongnu.org; Mon, 24 Jun 2019 09:43:58 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]:50526) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hfPGG-0007XQ-BX for qemu-devel@nongnu.org; Mon, 24 Jun 2019 09:43:56 -0400 Received: by mail-wm1-x32c.google.com with SMTP id c66so12881370wmf.0 for ; Mon, 24 Jun 2019 06:43:51 -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=Q/rV4H+M74u+dhawBtWuITzFuv6kQ3ZswIz8UU+IjNo=; b=rB/3XN8xaJn+TXtKR1EHfDwWUioqbmCwAUR0RL/KXdhBbMVOlVpHNdSlvqLDXn0YZV 67or258xLFQCKwIqIOvKunmwvdfFvo3hxooMIIO7DNjNKbSm5x1x0Z/1DMfUO/eLcA/j QYfu2bJdKufBfgj/+2/IHZEu0lvk9qqh48T2faX/vjG9yu/qeUV2HVFkj/3XTxCFtSta jKdz6MZpnNXIgkO/sA8kenxkZiFebzRKaLHQlXvY66xOOETldTNoD9juafhtZ7cbvlGk 0kxVLkanNCEL7VhKgMZ18wUlerQOWsXFeQ3VpF1Upr2YJYQZ1bGKPf3TKPkFpu10qode rMrQ== 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=Q/rV4H+M74u+dhawBtWuITzFuv6kQ3ZswIz8UU+IjNo=; b=GEC641m3dgN0jlOdlijPFZimjK2ApFdef0PGsbPo1GsgULs00qzbv7zcPv+V7fCr+b lO4PoT8iO63IFEcy1iGQhZGucl8GqSu7gXKojN772Sl3JlgGxYhl5OtxvAnD6aK3Vp9R RCiWaI3EdQOrgC/HXsxjzCFDp6VBUD8eBix3M6VXidiNS4lcCT/SPzv9h8M9qETCqcxB wyTAtPtMJvR/J46lFft2rgMht667hQbsXBTbdG/mV+8DgJOGGwqZ5Wyd+RgjGlJ+kpYu lG8VWkobdFlcFwHiCmEzTX2gYdqnrfB3nqNxCTNRWv6w31Wr7HB9VQnn9fPMimO0ng3n ucdQ== X-Gm-Message-State: APjAAAXUqk4BPcTmPYmIrZW4CfdzEkbcsVWhxT4avuxr8PZrLlH8Xl0J 7N7vhIrPP8ZCEHnLEkTW/fUkvQ== X-Received: by 2002:a05:600c:2549:: with SMTP id e9mr16443672wma.46.1561383830031; Mon, 24 Jun 2019 06:43:50 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id e7sm8165642wmd.0.2019.06.24.06.43.42 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 24 Jun 2019 06:43:48 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 108131FF8C; Mon, 24 Jun 2019 14:43:39 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Mon, 24 Jun 2019 14:43:36 +0100 Message-Id: <20190624134337.10532-19-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190624134337.10532-1-alex.bennee@linaro.org> References: <20190624134337.10532-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::32c Subject: [Qemu-devel] [PULL 18/19] Makefile: Rename the 'vm-test' target as 'vm-help' X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, Stefano Garzarella Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé We already have 'make check-help', use the 'make vm-help' form to display helps about VM testing. Keep the old target to not bother old customs. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Stefano Garzarella Message-Id: <20190531064341.29730-1-philmd@redhat.com> Signed-off-by: Alex Bennée -- 2.20.1 diff --git a/Makefile b/Makefile index cfb18f1525..bdeb259dfa 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ SRC_PATH=. UNCHECKED_GOALS := %clean TAGS cscope ctags dist \ html info pdf txt \ help check-help print-% \ - docker docker-% vm-test vm-build-% + docker docker-% vm-help vm-test vm-build-% print-%: @echo '$*=$($*)' @@ -1148,7 +1148,7 @@ endif @echo 'Test targets:' @echo ' check - Run all tests (check-help for details)' @echo ' docker - Help about targets running tests inside Docker containers' - @echo ' vm-test - Help about targets running tests inside VM' + @echo ' vm-help - Help about targets running tests inside VM' @echo '' @echo 'Documentation targets:' @echo ' html info pdf txt' diff --git a/docs/devel/testing.rst b/docs/devel/testing.rst index da2d0fc964..68aba3926e 100644 --- a/docs/devel/testing.rst +++ b/docs/devel/testing.rst @@ -399,12 +399,12 @@ VM testing This test suite contains scripts that bootstrap various guest images that have necessary packages to build QEMU. The basic usage is documented in ``Makefile`` -help which is displayed with ``make vm-test``. +help which is displayed with ``make vm-help``. Quickstart ---------- -Run ``make vm-test`` to list available make targets. Invoke a specific make +Run ``make vm-help`` to list available make targets. Invoke a specific make command to run build test in an image. For example, ``make vm-build-freebsd`` will build the source tree in the FreeBSD image. The command can be executed from either the source tree or the build dir; if the former, ``./configure`` is diff --git a/tests/vm/Makefile.include b/tests/vm/Makefile.include index 809b80e2e5..3560716092 100644 --- a/tests/vm/Makefile.include +++ b/tests/vm/Makefile.include @@ -8,8 +8,9 @@ IMAGE_FILES := $(patsubst %, $(IMAGES_DIR)/%.img, $(IMAGES)) .PRECIOUS: $(IMAGE_FILES) -vm-test: - @echo "vm-test: Test QEMU in preconfigured virtual machines" +# 'vm-help' target was historically named 'vm-test' +vm-help vm-test: + @echo "vm-help: Test QEMU in preconfigured virtual machines" @echo @echo " vm-build-ubuntu.i386 - Build QEMU in ubuntu i386 VM" @echo " vm-build-freebsd - Build QEMU in FreeBSD VM"