Re: [libvirt] [PATCH] cputest: Skip tests requiring JSON_MODELS if QEMU is disabled

On Wed, Nov 01, 2017 at 06:57:42PM +0100, Jiri Denemark wrote: > Some tests require JSON_MODELS to be parsed into qemuCaps and applied > when computing CPU models and such test cannot succeed if QEMU driver is > disabled. Let's mark the tests with JSON_MODELS_REQUIRED and skip the > appropriate parts if building without QEMU. > > On the other hand, CPU tests with JSON_MODELS should succeed even if > model definitions from QEMU are not parsed and applied. Let's explicitly > test this by repeating the tests without JSON_MODELS set. > > This fixes the build with QEMU driver disabled, e.g., on some > architectures on RHEL/CentOS. > > Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt; > --- > tests/cputest.c | 70 ++++++++++++++++++++++++++++++++++++++++----------------- > 1 file changed, 49 insertions(+), 21 deletions(-) > > diff --git a/tests/cputest.c b/tests/cputest.c > index 5d1fe7d99..8e94c2152 100644 > --- a/tests/cputest.c > +++ b/tests/cputest.c > @@ -464,6 +464,7 @@ typedef enum { > JSON_NONE, > JSON_HOST, > JSON_MODELS, > + JSON_MODELS_REQUIRED, > } cpuTestCPUIDJson; After discussion on IRC please describe when JSON_MODELS_REQUIRED should be used, preferably in the code, commit message is good as well but if the code gets moved, it's easier to have it in the code.