External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-22 04:25:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: skip qemublocktest if building without YAJL

Browse Source 
If no JSON parser is available qemublocktest fails, so skip its execution.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2018-09-04 12:00:14 +01:00
parent 7469aa0bc2
commit dfd282f620
1 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
tests/qemublocktest.c
View File

@ -19,17 +19,19 @@
#include <stdlib.h> #include <stdlib.h>
#include "testutils.h" #include "testutils.h"
#include "testutilsqemu.h"
#include "testutilsqemuschema.h"
#include "virstoragefile.h"
#include "virstring.h"
#include "virlog.h"
#include "qemu/qemu_block.h"
#include "qemu/qemu_qapi.h"
#include "qemu/qemu_command.h" #if WITH_YAJL
# include "testutilsqemu.h"
# include "testutilsqemuschema.h"
# include "virstoragefile.h"
# include "virstring.h"
# include "virlog.h"
# include "qemu/qemu_block.h"
# include "qemu/qemu_qapi.h"
#define VIR_FROM_THIS VIR_FROM_NONE # include "qemu/qemu_command.h"
# define VIR_FROM_THIS VIR_FROM_NONE
VIR_LOG_INIT("tests.storagetest"); VIR_LOG_INIT("tests.storagetest");
@ -355,7 +357,7 @@ mymain(void)
virTestCounterReset("qemu storage source xml->json->xml "); virTestCounterReset("qemu storage source xml->json->xml ");
#define TEST_JSON_FORMAT(tpe, xmlstr) \ # define TEST_JSON_FORMAT(tpe, xmlstr) \
do { \ do { \
xmljsonxmldata.type = tpe; \ xmljsonxmldata.type = tpe; \
xmljsonxmldata.xml = xmlstr; \ xmljsonxmldata.xml = xmlstr; \
@ -364,7 +366,7 @@ mymain(void)
ret = -1; \ ret = -1; \
} while (0) } while (0)
#define TEST_JSON_FORMAT_NET(xmlstr)\ # define TEST_JSON_FORMAT_NET(xmlstr) \
TEST_JSON_FORMAT(VIR_STORAGE_TYPE_NETWORK, xmlstr) TEST_JSON_FORMAT(VIR_STORAGE_TYPE_NETWORK, xmlstr)
TEST_JSON_FORMAT(VIR_STORAGE_TYPE_FILE, "<source file='/path/to/file'/>\n"); TEST_JSON_FORMAT(VIR_STORAGE_TYPE_FILE, "<source file='/path/to/file'/>\n");
@ -417,7 +419,7 @@ mymain(void)
" <host name='example.com' port='9999'/>\n" " <host name='example.com' port='9999'/>\n"
"</source>\n"); "</source>\n");
#define TEST_DISK_TO_JSON_FULL(nme, fl) \ # define TEST_DISK_TO_JSON_FULL(nme, fl) \
do { \ do { \
diskxmljsondata.name = nme; \ diskxmljsondata.name = nme; \
diskxmljsondata.props = NULL; \ diskxmljsondata.props = NULL; \
@ -435,7 +437,7 @@ mymain(void)
testQemuDiskXMLToPropsClear(&diskxmljsondata); \ testQemuDiskXMLToPropsClear(&diskxmljsondata); \
} while (0) } while (0)
#define TEST_DISK_TO_JSON(nme) TEST_DISK_TO_JSON_FULL(nme, false) # define TEST_DISK_TO_JSON(nme) TEST_DISK_TO_JSON_FULL(nme, false)
if (!(diskxmljsondata.schema = testQEMUSchemaLoad())) { if (!(diskxmljsondata.schema = testQEMUSchemaLoad())) {
ret = -1; ret = -1;
@ -500,4 +502,12 @@ mymain(void)
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
} }
#else
static int
mymain(void)
{
return EXIT_AM_SKIP;
}
#endif
VIR_TEST_MAIN(mymain) VIR_TEST_MAIN(mymain)