mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-22 05:35:25 +00:00
tests: Rename 'qemuxml2argvtest' to 'qemuxmlconftest'
Since this tests inactive/config XML files rename it accordingly. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
parent
f588a5a996
commit
5969ad097d
@ -45,7 +45,7 @@ I.e. to run all tests from 3 to 20 with the exception of tests
|
|||||||
|
|
||||||
::
|
::
|
||||||
|
|
||||||
$ VIR_TEST_DEBUG=1 VIR_TEST_RANGE=3-5,7-20,^16 ./run tests/qemuxml2argvtest
|
$ VIR_TEST_DEBUG=1 VIR_TEST_RANGE=3-5,7-20,^16 ./run tests/qemuxmlconftest
|
||||||
|
|
||||||
Also, individual tests can be run from inside the ``tests/``
|
Also, individual tests can be run from inside the ``tests/``
|
||||||
directory, like:
|
directory, like:
|
||||||
@ -62,7 +62,7 @@ CAREFULLY to ensure they are correct.
|
|||||||
|
|
||||||
::
|
::
|
||||||
|
|
||||||
$ VIR_TEST_REGENERATE_OUTPUT=1 ./qemuxml2argvtest
|
$ VIR_TEST_REGENERATE_OUTPUT=1 ./qemuxmlconftest
|
||||||
|
|
||||||
There is also a ``./run`` script at the top level, to make it
|
There is also a ``./run`` script at the top level, to make it
|
||||||
easier to run programs that have not yet been installed, as
|
easier to run programs that have not yet been installed, as
|
||||||
@ -81,7 +81,7 @@ location where the file is stored.
|
|||||||
|
|
||||||
::
|
::
|
||||||
|
|
||||||
$ VIR_TEST_FILE_ACCESS=1 VIR_TEST_FILE_ACCESS_OUTPUT="/tmp/file_access.txt" ./qemuxml2argvtest
|
$ VIR_TEST_FILE_ACCESS=1 VIR_TEST_FILE_ACCESS_OUTPUT="/tmp/file_access.txt" ./qemuxmlconftest
|
||||||
|
|
||||||
#. The Valgrind test should produce similar output to
|
#. The Valgrind test should produce similar output to
|
||||||
``ninja test``. If the output has traces within libvirt API's,
|
``ninja test``. If the output has traces within libvirt API's,
|
||||||
@ -98,9 +98,9 @@ of leak:
|
|||||||
==5414== by 0x4CD581D: virDomainDefParseXML (domain_conf.c:10188)
|
==5414== by 0x4CD581D: virDomainDefParseXML (domain_conf.c:10188)
|
||||||
==5414== by 0x4CD8C73: virDomainDefParseNode (domain_conf.c:10640)
|
==5414== by 0x4CD8C73: virDomainDefParseNode (domain_conf.c:10640)
|
||||||
==5414== by 0x4CD8DDB: virDomainDefParse (domain_conf.c:10590)
|
==5414== by 0x4CD8DDB: virDomainDefParse (domain_conf.c:10590)
|
||||||
==5414== by 0x41CB1D: testCompareXMLToArgvHelper (qemuxml2argvtest.c:100)
|
==5414== by 0x41CB1D: testCompareXMLToArgvHelper (qemuxmlconftest.c:100)
|
||||||
==5414== by 0x41E20F: virtTestRun (testutils.c:161)
|
==5414== by 0x41E20F: virtTestRun (testutils.c:161)
|
||||||
==5414== by 0x41C7CB: mymain (qemuxml2argvtest.c:866)
|
==5414== by 0x41C7CB: mymain (qemuxmlconftest.c:866)
|
||||||
==5414== by 0x41E84A: virtTestMain (testutils.c:723)
|
==5414== by 0x41E84A: virtTestMain (testutils.c:723)
|
||||||
==5414== by 0x34D9021734: (below main) (in /usr/lib64/libc-2.15.so)
|
==5414== by 0x34D9021734: (below main) (in /usr/lib64/libc-2.15.so)
|
||||||
|
|
||||||
|
@ -155,7 +155,7 @@ virSecretGetSecretString(virConnectPtr conn,
|
|||||||
if (!sec)
|
if (!sec)
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
/* NB: NONE is a byproduct of the qemuxml2argvtest test mocking
|
/* NB: NONE is a byproduct of the qemuxmlconftest test mocking
|
||||||
* for UUID lookups. Normal secret XML processing would fail if
|
* for UUID lookups. Normal secret XML processing would fail if
|
||||||
* the usage type was NONE and since we have no way to set the
|
* the usage type was NONE and since we have no way to set the
|
||||||
* expected usage in that environment, let's just accept NONE */
|
* expected usage in that environment, let's just accept NONE */
|
||||||
|
@ -455,7 +455,7 @@ if conf.has('WITH_QEMU')
|
|||||||
{ 'name': 'qemusecuritytest', 'sources': [ 'qemusecuritytest.c', 'qemusecuritymock.c' ], 'link_with': [ test_qemu_driver_lib ], 'link_whole': [ test_utils_qemu_lib ] },
|
{ 'name': 'qemusecuritytest', 'sources': [ 'qemusecuritytest.c', 'qemusecuritymock.c' ], 'link_with': [ test_qemu_driver_lib ], 'link_whole': [ test_utils_qemu_lib ] },
|
||||||
{ 'name': 'qemuxmlactivetest', 'link_with': [ test_qemu_driver_lib ], 'link_whole': [ test_utils_qemu_lib, test_file_wrapper_lib ] },
|
{ 'name': 'qemuxmlactivetest', 'link_with': [ test_qemu_driver_lib ], 'link_whole': [ test_utils_qemu_lib, test_file_wrapper_lib ] },
|
||||||
{ 'name': 'qemuvhostusertest', 'link_with': [ test_qemu_driver_lib ], 'link_whole': [ test_file_wrapper_lib ] },
|
{ 'name': 'qemuvhostusertest', 'link_with': [ test_qemu_driver_lib ], 'link_whole': [ test_file_wrapper_lib ] },
|
||||||
{ 'name': 'qemuxml2argvtest', 'timeout': 90, 'link_with': [ test_qemu_driver_lib, test_utils_qemu_monitor_lib ], 'link_whole': [ test_utils_qemu_lib, test_file_wrapper_lib ] },
|
{ 'name': 'qemuxmlconftest', 'timeout': 90, 'link_with': [ test_qemu_driver_lib, test_utils_qemu_monitor_lib ], 'link_whole': [ test_utils_qemu_lib, test_file_wrapper_lib ] },
|
||||||
]
|
]
|
||||||
if conf.has('WITH_NBDKIT')
|
if conf.has('WITH_NBDKIT')
|
||||||
tests += [
|
tests += [
|
||||||
|
@ -10,7 +10,7 @@ Test data in this directory is used:
|
|||||||
- to excercise the capability parsing code in ``qemucapabilitiestest``
|
- to excercise the capability parsing code in ``qemucapabilitiestest``
|
||||||
|
|
||||||
- provides "real" capabilities data for test suites such as ``domaincapstest``
|
- provides "real" capabilities data for test suites such as ``domaincapstest``
|
||||||
``qemuxml2argvtest``, and others
|
``qemuxmlconftest``, and others
|
||||||
|
|
||||||
- provides the required data to validate the QMP commands used by libvirt
|
- provides the required data to validate the QMP commands used by libvirt
|
||||||
against qemu's QMP schema
|
against qemu's QMP schema
|
||||||
@ -65,7 +65,7 @@ Test suites such as ``qemucapabilitiestest`` or ``domaincapstest`` pick up the
|
|||||||
test data automatically once the corresponding ``.xml`` or ``.replies`` file
|
test data automatically once the corresponding ``.xml`` or ``.replies`` file
|
||||||
is present in ``tests/qemucapabilitiesdata``.
|
is present in ``tests/qemucapabilitiesdata``.
|
||||||
|
|
||||||
Other test suites such as ``qemuxml2argvtest`` provide macros which invoke test
|
Other test suites such as ``qemuxmlconftest`` provide macros which invoke test
|
||||||
cases using this data such as ``DO_TEST_CAPS_LATEST``.
|
cases using this data such as ``DO_TEST_CAPS_LATEST``.
|
||||||
|
|
||||||
Capturing QEMU capabilities
|
Capturing QEMU capabilities
|
||||||
|
Loading…
Reference in New Issue
Block a user