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>

diff --git a/Makefile b/Makefile
index 45cc2f4f4deb92660fd62e1e09ef2395db062944..c63de4e36c4b402d672a50139985a02805226961 100644 (file)
--- 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 da2d0fc9646f39fe000250ea3386a182b7d8f529..68aba3926e843515419e8bd1f312d5bf28d33820 100644 (file)
--- 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 809b80e2e56d75e5d20bfc070d5cfecb48eade53..35607160921c51c6cf78ebb6aea20a1277db7f0a 100644 (file)
--- 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"