This function doesn't follow our convention of naming functions. --- tests/qemuargv2xmltest.c | 2 +- tests/qemuxml2argvtest.c | 2 +- tests/testutils.c | 2 +- tests/testutils.h | 2 +- tests/virfirewalltest.c | 8 ++++---- 5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/tests/qemuargv2xmltest.c b/tests/qemuargv2xmltest.c index de9ec5d..c614e9f 100644 --- a/tests/qemuargv2xmltest.c +++ b/tests/qemuargv2xmltest.c @@ -69,7 +69,7 @@ static int testCompareXMLToArgvFiles(const char *xmlfile, cmd, NULL, NULL, NULL))) goto fail; - if (!virtTestOOMActive()) { + if (!virTestOOMActive()) { if ((log = virtTestLogContentAndReset()) == NULL) goto fail; if (flags & FLAG_EXPECT_WARNING) { diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index e045959..e4edb83 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -351,7 +351,7 @@ static int testCompareXMLToArgvFiles(const char *xml, VIR_TEST_DEBUG("Error expected but there wasn't any.\n"); goto out; } - if (!virtTestOOMActive()) { + if (!virTestOOMActive()) { if (flags & FLAG_EXPECT_FAILURE) { if ((log = virtTestLogContentAndReset())) VIR_TEST_DEBUG("Got expected error: \n%s", log); diff --git a/tests/testutils.c b/tests/testutils.c index 04145be..592e0e0 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -84,7 +84,7 @@ static size_t testEnd; char *progname; -bool virtTestOOMActive(void) +bool virTestOOMActive(void) { return testOOMActive; } diff --git a/tests/testutils.h b/tests/testutils.h index a16b4dd..b60c21f 100644 --- a/tests/testutils.h +++ b/tests/testutils.h @@ -46,7 +46,7 @@ extern char *progname; # error Fix Makefile.am # endif -bool virtTestOOMActive(void); +bool virTestOOMActive(void); int virTestRun(const char *title, int (*body)(const void *data), diff --git a/tests/virfirewalltest.c b/tests/virfirewalltest.c index 338f714..6f4fed5 100644 --- a/tests/virfirewalltest.c +++ b/tests/virfirewalltest.c @@ -611,7 +611,7 @@ testFirewallNoRollback(const void *opaque ATTRIBUTE_UNUSED) goto cleanup; } - if (virtTestOOMActive()) + if (virTestOOMActive()) goto cleanup; if (virBufferError(&cmdbuf)) @@ -701,7 +701,7 @@ testFirewallSingleRollback(const void *opaque ATTRIBUTE_UNUSED) goto cleanup; } - if (virtTestOOMActive()) + if (virTestOOMActive()) goto cleanup; if (virBufferError(&cmdbuf)) @@ -794,7 +794,7 @@ testFirewallManyRollback(const void *opaque ATTRIBUTE_UNUSED) goto cleanup; } - if (virtTestOOMActive()) + if (virTestOOMActive()) goto cleanup; if (virBufferError(&cmdbuf)) @@ -917,7 +917,7 @@ testFirewallChainedRollback(const void *opaque ATTRIBUTE_UNUSED) goto cleanup; } - if (virtTestOOMActive()) + if (virTestOOMActive()) goto cleanup; if (virBufferError(&cmdbuf)) -- 2.5.5 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list