Signed-off-by: Shi Lei <shi_lei@xxxxxxxxxxxxxx>
---
tests/qemuxml2argvmock.c | 2 +-
tests/sexpr2xmltest.c | 30 +++++-----
tests/virnetdevmock.c | 1 -
tests/virnettlshelpers.c | 18 +++---
tests/virshtest.c | 118 +++++++++++++++++++--------------------
tests/vshtabletest.c | 3 -
tests/xml2sexprtest.c | 24 ++++----
7 files changed, 96 insertions(+), 100 deletions(-)
diff --git a/tests/qemuxml2argvmock.c b/tests/qemuxml2argvmock.c
index 4b4a6f7..79152d9 100644
--- a/tests/qemuxml2argvmock.c
+++ b/tests/qemuxml2argvmock.c
@@ -66,7 +66,7 @@ virNumaIsAvailable(void)
int
virNumaGetMaxNode(void)
{
- return 7;
+ return 7;
}
/* We shouldn't need to mock virNumaNodeIsAvailable() and *definitely* not
diff --git a/tests/sexpr2xmltest.c b/tests/sexpr2xmltest.c
index efe6411..4a1a1ed 100644
--- a/tests/sexpr2xmltest.c
+++ b/tests/sexpr2xmltest.c
@@ -21,37 +21,37 @@ static virDomainXMLOptionPtr xmlopt;
static int
testCompareFiles(const char *xml, const char *sexpr)
{
- char *sexprData = NULL;
- char *gotxml = NULL;
- int ret = -1;
- virDomainDefPtr def = NULL;
+ char *sexprData = NULL;
+ char *gotxml = NULL;
+ int ret = -1;
+ virDomainDefPtr def = NULL;
- if (virTestLoadFile(sexpr, &sexprData) < 0)
+ if (virTestLoadFile(sexpr, &sexprData) < 0)
goto fail;
- if (!(def = xenParseSxprString(sexprData,
+ if (!(def = xenParseSxprString(sexprData,
NULL, -1, caps, xmlopt)))
goto fail;
- if (!virDomainDefCheckABIStability(def, def, xmlopt)) {
+ if (!virDomainDefCheckABIStability(def, def, xmlopt)) {
fprintf(stderr, "ABI stability check failed on %s", xml);
goto fail;
- }
+ }
- if (!(gotxml = virDomainDefFormat(def, caps, 0)))
+ if (!(gotxml = virDomainDefFormat(def, caps, 0)))
goto fail;
- if (virTestCompareToFile(gotxml, xml) < 0)
+ if (virTestCompareToFile(gotxml, xml) < 0)
goto fail;
- ret = 0;
+ ret = 0;
fail:
- VIR_FREE(sexprData);
- VIR_FREE(gotxml);
- virDomainDefFree(def);
+ VIR_FREE(sexprData);
+ VIR_FREE(gotxml);
+ virDomainDefFree(def);
- return ret;
+ return ret;
}
struct testInfo {
diff --git a/tests/virnetdevmock.c b/tests/virnetdevmock.c
index a9967b7..3eb5059 100644
--- a/tests/virnetdevmock.c
+++ b/tests/virnetdevmock.c
@@ -34,7 +34,6 @@ virNetDevSysfsFile(char **pf_sysfs_device_link,
const char *ifname,
const char *file)
{
-
if (virAsprintfQuiet(pf_sysfs_device_link, "%s/%s/%s",
NET_DEV_TEST_DATA_PREFIX, ifname, file) < 0) {
fprintf(stderr, "Out of memory\n");
diff --git a/tests/virnettlshelpers.c b/tests/virnettlshelpers.c
index 5c94f89..8cb8c3e 100644
--- a/tests/virnettlshelpers.c
+++ b/tests/virnettlshelpers.c
@@ -126,19 +126,19 @@ static void testTLSDerEncode(ASN1_TYPE src,
const char *src_name,
gnutls_datum_t * res)
{
- int size;
- char *data = NULL;
+ int size;
+ char *data = NULL;
- size = 0;
- asn1_der_coding(src, src_name, NULL, &size, NULL);
+ size = 0;
+ asn1_der_coding(src, src_name, NULL, &size, NULL);
- if (VIR_ALLOC_N(data, size) < 0)
- abort();
+ if (VIR_ALLOC_N(data, size) < 0)
+ abort();
- asn1_der_coding(src, src_name, data, &size, NULL);
+ asn1_der_coding(src, src_name, data, &size, NULL);
- res->data = (unsigned char *)data;
- res->size = size;
+ res->data = (unsigned char *)data;
+ res->size = size;
}
diff --git a/tests/virshtest.c b/tests/virshtest.c
index 10cd0d3..5e73ad9 100644
--- a/tests/virshtest.c
+++ b/tests/virshtest.c
@@ -44,18 +44,18 @@ static const char *domstate_fc4 = "running\n\n";
static int testFilterLine(char *buffer,
const char *toRemove)
{
- char *start;
- char *end;
+ char *start;
+ char *end;
- if (!(start = strstr(buffer, toRemove)))
+ if (!(start = strstr(buffer, toRemove)))
return -1;
- if (!(end = strstr(start+1, "\n"))) {
+ if (!(end = strstr(start+1, "\n"))) {
*start = '\0';
- } else {
+ } else {
memmove(start, end, strlen(end)+1);
- }
- return 0;
+ }
+ return 0;
}
static int
@@ -96,31 +96,31 @@ static char *custom_uri;
static int testCompareListDefault(const void *data ATTRIBUTE_UNUSED)
{
- const char *const argv[] = { VIRSH_DEFAULT, "list", NULL };
- const char *exp = "\
+ const char *const argv[] = { VIRSH_DEFAULT, "list", NULL };
+ const char *exp = "\
Id Name State \n\
----------------------\n\
1 test running \n\
\n";
- return testCompareOutputLit(exp, NULL, argv);
+ return testCompareOutputLit(exp, NULL, argv);
}
static int testCompareListCustom(const void *data ATTRIBUTE_UNUSED)
{
- const char *const argv[] = { VIRSH_CUSTOM, "list", NULL };
- const char *exp = "\
+ const char *const argv[] = { VIRSH_CUSTOM, "list", NULL };
+ const char *exp = "\
Id Name State \n\
----------------------\n\
1 fv0 running \n\
2 fc4 running \n\
\n";
- return testCompareOutputLit(exp, NULL, argv);
+ return testCompareOutputLit(exp, NULL, argv);
}
static int testCompareNodeinfoDefault(const void *data ATTRIBUTE_UNUSED)
{
- const char *const argv[] = { VIRSH_DEFAULT, "nodeinfo", NULL };
- const char *exp = "\
+ const char *const argv[] = { VIRSH_DEFAULT, "nodeinfo", NULL };
+ const char *exp = "\
CPU model: i686\n\
CPU(s): 16\n\
CPU frequency: 1400 MHz\n\
@@ -130,17 +130,17 @@ Thread(s) per core: 2\n\
NUMA cell(s): 2\n\
Memory size: 3145728 KiB\n\
\n";
- return testCompareOutputLit(exp, NULL, argv);
+ return testCompareOutputLit(exp, NULL, argv);
}
static int testCompareNodeinfoCustom(const void *data ATTRIBUTE_UNUSED)
{
- const char *const argv[] = {
- VIRSH_CUSTOM,
- "nodeinfo",
- NULL
- };
- const char *exp = "\
+ const char *const argv[] = {
+ VIRSH_CUSTOM,
+ "nodeinfo",
+ NULL
+ };
+ const char *exp = "\
CPU model: i986\n\
CPU(s): 50\n\
CPU frequency: 6000 MHz\n\
@@ -150,91 +150,91 @@ Thread(s) per core: 2\n\
NUMA cell(s): 4\n\
Memory size: 8192000 KiB\n\
\n";
- return testCompareOutputLit(exp, NULL, argv);
+ return testCompareOutputLit(exp, NULL, argv);
}
static int testCompareDominfoByID(const void *data ATTRIBUTE_UNUSED)
{
- const char *const argv[] = { VIRSH_CUSTOM, "dominfo", "2", NULL };
- const char *exp = dominfo_fc4;
- return testCompareOutputLit(exp, "\nCPU time:", argv);
+ const char *const argv[] = { VIRSH_CUSTOM, "dominfo", "2", NULL };
+ const char *exp = dominfo_fc4;
+ return testCompareOutputLit(exp, "\nCPU time:", argv);
}
static int testCompareDominfoByUUID(const void *data ATTRIBUTE_UNUSED)
{
- const char *const argv[] = { VIRSH_CUSTOM, "dominfo", DOM_UUID, NULL };
- const char *exp = dominfo_fc4;
- return testCompareOutputLit(exp, "\nCPU time:", argv);
+ const char *const argv[] = { VIRSH_CUSTOM, "dominfo", DOM_UUID, NULL };
+ const char *exp = dominfo_fc4;
+ return testCompareOutputLit(exp, "\nCPU time:", argv);
}
static int testCompareDominfoByName(const void *data ATTRIBUTE_UNUSED)
{
- const char *const argv[] = { VIRSH_CUSTOM, "dominfo", "fc4", NULL };
- const char *exp = dominfo_fc4;
- return testCompareOutputLit(exp, "\nCPU time:", argv);
+ const char *const argv[] = { VIRSH_CUSTOM, "dominfo", "fc4", NULL };
+ const char *exp = dominfo_fc4;
+ return testCompareOutputLit(exp, "\nCPU time:", argv);
}
static int testCompareDomuuidByID(const void *data ATTRIBUTE_UNUSED)
{
- const char *const argv[] = { VIRSH_CUSTOM, "domuuid", "2", NULL };
- const char *exp = domuuid_fc4;
- return testCompareOutputLit(exp, NULL, argv);
+ const char *const argv[] = { VIRSH_CUSTOM, "domuuid", "2", NULL };
+ const char *exp = domuuid_fc4;
+ return testCompareOutputLit(exp, NULL, argv);
}
static int testCompareDomuuidByName(const void *data ATTRIBUTE_UNUSED)
{
- const char *const argv[] = { VIRSH_CUSTOM, "domuuid", "fc4", NULL };
- const char *exp = domuuid_fc4;
- return testCompareOutputLit(exp, NULL, argv);
+ const char *const argv[] = { VIRSH_CUSTOM, "domuuid", "fc4", NULL };
+ const char *exp = domuuid_fc4;
+ return testCompareOutputLit(exp, NULL, argv);
}
static int testCompareDomidByName(const void *data ATTRIBUTE_UNUSED)
{
- const char *const argv[] = { VIRSH_CUSTOM, "domid", "fc4", NULL };
- const char *exp = domid_fc4;
- return testCompareOutputLit(exp, NULL, argv);
+ const char *const argv[] = { VIRSH_CUSTOM, "domid", "fc4", NULL };
+ const char *exp = domid_fc4;
+ return testCompareOutputLit(exp, NULL, argv);
}
static int testCompareDomidByUUID(const void *data ATTRIBUTE_UNUSED)
{
- const char *const argv[] = { VIRSH_CUSTOM, "domid", DOM_UUID, NULL };
- const char *exp = domid_fc4;
- return testCompareOutputLit(exp, NULL, argv);
+ const char *const argv[] = { VIRSH_CUSTOM, "domid", DOM_UUID, NULL };
+ const char *exp = domid_fc4;
+ return testCompareOutputLit(exp, NULL, argv);
}
static int testCompareDomnameByID(const void *data ATTRIBUTE_UNUSED)
{
- const char *const argv[] = { VIRSH_CUSTOM, "domname", "2", NULL };
- const char *exp = domname_fc4;
- return testCompareOutputLit(exp, NULL, argv);
+ const char *const argv[] = { VIRSH_CUSTOM, "domname", "2", NULL };
+ const char *exp = domname_fc4;
+ return testCompareOutputLit(exp, NULL, argv);
}
static int testCompareDomnameByUUID(const void *data ATTRIBUTE_UNUSED)
{
- const char *const argv[] = { VIRSH_CUSTOM, "domname", DOM_UUID, NULL };
- const char *exp = domname_fc4;
- return testCompareOutputLit(exp, NULL, argv);
+ const char *const argv[] = { VIRSH_CUSTOM, "domname", DOM_UUID, NULL };
+ const char *exp = domname_fc4;
+ return testCompareOutputLit(exp, NULL, argv);
}
static int testCompareDomstateByID(const void *data ATTRIBUTE_UNUSED)
{
- const char *const argv[] = { VIRSH_CUSTOM, "domstate", "2", NULL };
- const char *exp = domstate_fc4;
- return testCompareOutputLit(exp, NULL, argv);
+ const char *const argv[] = { VIRSH_CUSTOM, "domstate", "2", NULL };
+ const char *exp = domstate_fc4;
+ return testCompareOutputLit(exp, NULL, argv);
}
static int testCompareDomstateByUUID(const void *data ATTRIBUTE_UNUSED)
{
- const char *const argv[] = { VIRSH_CUSTOM, "domstate", DOM_UUID, NULL };
- const char *exp = domstate_fc4;
- return testCompareOutputLit(exp, NULL, argv);
+ const char *const argv[] = { VIRSH_CUSTOM, "domstate", DOM_UUID, NULL };
+ const char *exp = domstate_fc4;
+ return testCompareOutputLit(exp, NULL, argv);
}
static int testCompareDomstateByName(const void *data ATTRIBUTE_UNUSED)
{
- const char *const argv[] = { VIRSH_CUSTOM, "domstate", "fc4", NULL };
- const char *exp = domstate_fc4;
- return testCompareOutputLit(exp, NULL, argv);
+ const char *const argv[] = { VIRSH_CUSTOM, "domstate", "fc4", NULL };
+ const char *exp = domstate_fc4;
+ return testCompareOutputLit(exp, NULL, argv);
}
struct testInfo {
diff --git a/tests/vshtabletest.c b/tests/vshtabletest.c
index 1138e34..ce415e8 100644
--- a/tests/vshtabletest.c
+++ b/tests/vshtabletest.c
@@ -116,7 +116,6 @@ testVshTableRowAppend(const void *opaque ATTRIBUTE_UNUSED)
static int
testUnicode(const void *opaque ATTRIBUTE_UNUSED)
{
-
int ret = 0;
char *act = NULL;
@@ -149,7 +148,6 @@ testUnicode(const void *opaque ATTRIBUTE_UNUSED)
static int
testUnicodeArabic(const void *opaque ATTRIBUTE_UNUSED)
{
-
int ret = 0;
char *act = NULL;
@@ -193,7 +191,6 @@ testUnicodeArabic(const void *opaque ATTRIBUTE_UNUSED)
static int
testUnicodeZeroWidthChar(const void *opaque ATTRIBUTE_UNUSED)
{
-
int ret = 0;
vshTablePtr table = NULL;
const char *exp =
diff --git a/tests/xml2sexprtest.c b/tests/xml2sexprtest.c
index 3e4d1d1..959a7ea 100644
--- a/tests/xml2sexprtest.c
+++ b/tests/xml2sexprtest.c
@@ -22,32 +22,32 @@ static virDomainXMLOptionPtr xmlopt;
static int
testCompareFiles(const char *xml, const char *sexpr)
{
- char *gotsexpr = NULL;
- int ret = -1;
- virDomainDefPtr def = NULL;
+ char *gotsexpr = NULL;
+ int ret = -1;
+ virDomainDefPtr def = NULL;
- if (!(def = virDomainDefParseFile(xml, caps, xmlopt, NULL,
+ if (!(def = virDomainDefParseFile(xml, caps, xmlopt, NULL,
VIR_DOMAIN_DEF_PARSE_INACTIVE)))
goto fail;
- if (!virDomainDefCheckABIStability(def, def, xmlopt)) {
+ if (!virDomainDefCheckABIStability(def, def, xmlopt)) {
fprintf(stderr, "ABI stability check failed on %s", xml);
goto fail;
- }
+ }
- if (!(gotsexpr = xenFormatSxpr(NULL, def)))
+ if (!(gotsexpr = xenFormatSxpr(NULL, def)))
goto fail;
- if (virTestCompareToFile(gotsexpr, sexpr) < 0)
+ if (virTestCompareToFile(gotsexpr, sexpr) < 0)
goto fail;
- ret = 0;
+ ret = 0;
fail:
- VIR_FREE(gotsexpr);
- virDomainDefFree(def);
+ VIR_FREE(gotsexpr);
+ virDomainDefFree(def);
- return ret;
+ return ret;
}
struct testInfo {
--
2.17.1
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list
