[PATCH 0/4] remove 'make check' references from code
Simple series that removes the references of the now former 'make check', replacing it to 'ninja test'. Daniel Henrique Barboza (4): docs: get rid of 'make check' references ci/Makefile: get rid of 'make check' references tests: get rid of 'make check' references vbox_XPCOMCGlue.c: get rid of 'make check' reference ci/Makefile | 6 +++--- docs/advanced-tests.rst | 2 +- docs/api_extension.html.in | 9 ++++----- docs/testsuites.html.in | 3 ++- src/vbox/vbox_XPCOMCGlue.c | 2 +- tests/domaincapstest.c | 2 +- tests/qemucapabilitiestest.c | 2 +- tests/test-lib.sh | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) -- 2.26.2
Update the remaining 'make check' references after the switch to meson/ninja. The reference in testsuites.html.in was kept with a note that it is the process for Libvirt 6.6.0 and older. Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com> --- docs/advanced-tests.rst | 2 +- docs/api_extension.html.in | 9 ++++----- docs/testsuites.html.in | 3 ++- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/advanced-tests.rst b/docs/advanced-tests.rst index bc20bbf4d9..458a9105b6 100644 --- a/docs/advanced-tests.rst +++ b/docs/advanced-tests.rst @@ -90,7 +90,7 @@ location where the file is stored. $ VIR_TEST_FILE_ACCESS=1 VIR_TEST_FILE_ACCESS_OUTPUT="/tmp/file_access.txt" ./qemuxml2argvtest #. The Valgrind test should produce similar output to -``make check``. If the output has traces within libvirt API's, +``ninja test``. If the output has traces within libvirt API's, then investigation is required in order to determine the cause of the issue. Output such as the following indicates some sort of leak: diff --git a/docs/api_extension.html.in b/docs/api_extension.html.in index 79e7913c1a..6c64e83314 100644 --- a/docs/api_extension.html.in +++ b/docs/api_extension.html.in @@ -361,11 +361,10 @@ </p> <p> - Once you have working functionality, run make check and make - syntax-check on each patch of the series before submitting - patches. It may also be worth writing tests for the libvirt-TCK - testsuite to exercise your new API, although those patches are - not kept in the libvirt repository. + Once you have working functionality, run ninja test on each patch + of the series before submitting patches. It may also be worth + writing tests for the libvirt-TCK testsuite to exercise your new API, + although those patches are not kept in the libvirt repository. </p> </body> </html> diff --git a/docs/testsuites.html.in b/docs/testsuites.html.in index a619e6d000..cd9cad9160 100644 --- a/docs/testsuites.html.in +++ b/docs/testsuites.html.in @@ -10,7 +10,8 @@ by developers before submitting patches upstream, it is also suggested to have it run and pass as part of the packaging process for distributions. It is run by launching: - <pre>make check</pre> + <pre>make check (libvirt 6.6.0 and older)</pre> + <pre>ninja test (libvirt 6.7.0 and newer)</pre> in a source tree after compilation has finished. It doesn't really make functional testing but checks that large portions of the code not interacting directly with virtualization -- 2.26.2
Update the remaining 'make check' references after the switch to meson/ninja. Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com> --- ci/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/Makefile b/ci/Makefile index 65d8fcca07..c7c8eb9a45 100644 --- a/ci/Makefile +++ b/ci/Makefile @@ -85,7 +85,7 @@ endif # IDs you run as do not need to exist in # the container's /etc/passwd & /etc/group files, but -# if they do not, then libvirt's 'make check' will fail +# if they do not, then libvirt's 'ninja test' will fail # many tests. # We do not directly mount /etc/{passwd,group} as Docker @@ -255,8 +255,8 @@ ci-help: @echo @echo "Available targets:" @echo - @echo " ci-build@\$$IMAGE - run a default 'make'" - @echo " ci-check@\$$IMAGE - run a 'make check'" + @echo " ci-build@\$$IMAGE - run a default 'ninja' build" + @echo " ci-check@\$$IMAGE - run a 'ninja test'" @echo " ci-shell@\$$IMAGE - run an interactive shell" @echo " ci-list-images - list available images" @echo " ci-help - show this help message" -- 2.26.2
Update the remaining 'make check' references after the switch to meson/ninja. Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com> --- tests/domaincapstest.c | 2 +- tests/qemucapabilitiestest.c | 2 +- tests/test-lib.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/domaincapstest.c b/tests/domaincapstest.c index c3a9f4ef91..674594ff8b 100644 --- a/tests/domaincapstest.c +++ b/tests/domaincapstest.c @@ -448,7 +448,7 @@ mymain(void) * programs will automatically pick it up. * * To generate the corresponding output files after a new replies - * file has been added, run "VIR_TEST_REGENERATE_OUTPUT=1 make check". + * file has been added, run "VIR_TEST_REGENERATE_OUTPUT=1 ninja test". */ virObjectUnref(cfg); diff --git a/tests/qemucapabilitiestest.c b/tests/qemucapabilitiestest.c index 82309b44bb..77fe716c20 100644 --- a/tests/qemucapabilitiestest.c +++ b/tests/qemucapabilitiestest.c @@ -225,7 +225,7 @@ mymain(void) * programs will automatically pick it up. * * To generate the corresponding output files after a new replies - * file has been added, run "VIR_TEST_REGENERATE_OUTPUT=1 make check". + * file has been added, run "VIR_TEST_REGENERATE_OUTPUT=1 ninja test". */ testQemuDataReset(&data); diff --git a/tests/test-lib.sh b/tests/test-lib.sh index c19005a371..cc3924c07a 100644 --- a/tests/test-lib.sh +++ b/tests/test-lib.sh @@ -200,7 +200,7 @@ test_expensive() if test "$VIR_TEST_EXPENSIVE" != 1; then skip_test_ ' This test is very expensive, so it is disabled by default. -To run it anyway, rerun: make check VIR_TEST_EXPENSIVE=1 +To run it anyway, rerun: VIR_TEST_EXPENSIVE=1 ninja test ' fi } -- 2.26.2
Change the 'make check' reference after the switch to meson/ninja. Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com> --- src/vbox/vbox_XPCOMCGlue.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vbox/vbox_XPCOMCGlue.c b/src/vbox/vbox_XPCOMCGlue.c index fa5a56ede6..3cbb679110 100644 --- a/src/vbox/vbox_XPCOMCGlue.c +++ b/src/vbox/vbox_XPCOMCGlue.c @@ -114,7 +114,7 @@ tryLoadOne(const char *dir, bool setAppHome, bool ignoreMissing, if (hVBoxXPCOMC == NULL) { /* - * FIXME: Don't warn in this case as it currently breaks make check + * FIXME: Don't warn in this case as it currently breaks ninja test * on systems without VirtualBox. */ if (dir != NULL) -- 2.26.2
On Thu, Aug 06, 2020 at 10:34:50AM -0300, Daniel Henrique Barboza wrote:
Simple series that removes the references of the now former 'make check', replacing it to 'ninja test'.
Daniel Henrique Barboza (4): docs: get rid of 'make check' references ci/Makefile: get rid of 'make check' references tests: get rid of 'make check' references vbox_XPCOMCGlue.c: get rid of 'make check' reference
ci/Makefile | 6 +++--- docs/advanced-tests.rst | 2 +- docs/api_extension.html.in | 9 ++++----- docs/testsuites.html.in | 3 ++- src/vbox/vbox_XPCOMCGlue.c | 2 +- tests/domaincapstest.c | 2 +- tests/qemucapabilitiestest.c | 2 +- tests/test-lib.sh | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-)
There's one occurrence in build-aux/syntax-check.mk. I'll send a trivial follow-up. Reviewed-by: Erik Skultety <eskultet@redhat.com>
participants (2)
-
Daniel Henrique Barboza -
Erik Skultety