diff options
| author | Philippe Mathieu-Daudé <philmd@redhat.com> | 2019-05-31 08:43:41 +0200 |
|---|---|---|
| committer | Alex Bennée <alex.bennee@linaro.org> | 2019-07-04 19:23:07 +0100 |
| commit | 4f2f62762f8119886fbb65920931613cd87840b3 (patch) | |
| tree | 066823d2ab71dcc63f8099c85b0a2a0647d90e0b | |
| parent | 71451cff5e11befa1bd4640d9b3ed78600958653 (diff) | |
| download | focaccia-qemu-4f2f62762f8119886fbb65920931613cd87840b3.tar.gz focaccia-qemu-4f2f62762f8119886fbb65920931613cd87840b3.zip | |
Makefile: Rename the 'vm-test' target as 'vm-help'
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é <philmd@redhat.com> Reviewed-by: Stefano Garzarella <sgarzare@redhat.com> Message-Id: <20190531064341.29730-1-philmd@redhat.com> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | docs/devel/testing.rst | 4 | ||||
| -rw-r--r-- | tests/vm/Makefile.include | 5 |
3 files changed, 7 insertions, 6 deletions
diff --git a/Makefile b/Makefile index 45cc2f4f4d..c63de4e36c 100644 --- a/Makefile +++ b/Makefile @@ -13,7 +13,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 '$*=$($*)' @@ -1153,7 +1153,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" |