driver.xmlopt))) {
if ((flags & FLAG_EXPECT_FAILURE) && !virTestOOMActive()) {
VIR_TEST_DEBUG("Got expected failure from "
- "bhyveParseCommandLineString.\n");
+ "bhyveParseCommandLineString.");
} else {
goto fail;
}
} else if ((flags & FLAG_EXPECT_FAILURE) && !virTestOOMActive()) {
VIR_TEST_DEBUG("Did not get expected failure from "
- "bhyveParseCommandLineString.\n");
+ "bhyveParseCommandLineString.");
goto fail;
}
log);
} else {
VIR_TEST_DEBUG("bhyveParseCommandLineString "
- "should have logged a warning\n");
+ "should have logged a warning");
goto fail;
}
} else { /* didn't expect a warning */
ret = 0;
} else if (flags & FLAG_EXPECT_FAILURE) {
ret = 0;
- VIR_TEST_DEBUG("Got expected error: %s\n",
+ VIR_TEST_DEBUG("Got expected error: %s",
virGetLastErrorMessage());
virResetLastError();
}
if ((cmd == NULL) || (ldcmd == NULL)) {
if (flags & FLAG_EXPECT_FAILURE) {
ret = 0;
- VIR_TEST_DEBUG("Got expected error: %s\n",
+ VIR_TEST_DEBUG("Got expected error: %s",
virGetLastErrorMessage());
virResetLastError();
}
if ((ret != 0) && (info->flags & FLAG_EXPECT_FAILURE)) {
ret = 0;
- VIR_TEST_DEBUG("Got expected error: %s\n",
+ VIR_TEST_DEBUG("Got expected error: %s",
virGetLastErrorMessage());
virResetLastError();
}
char *log; \
if ((log = virTestLogContentAndReset()) && \
strlen(log) > 0) \
- VIR_TEST_DEBUG("\n%s\n", log); \
+ VIR_TEST_DEBUG("\n%s", log); \
VIR_FREE(log); \
} \
ret = -1; \
ok:
if (ret == 0 && flags & FLAG_EXPECT_FAILURE) {
ret = -1;
- VIR_TEST_DEBUG("Error expected but there wasn't any.\n");
+ VIR_TEST_DEBUG("Error expected but there wasn't any.");
goto cleanup;
}
if (!virTestOOMActive()) {
VIR_DOMAIN_DEF_PARSE_PCI_ORIG_STATES |
VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE |
VIR_DOMAIN_DEF_PARSE_ALLOW_POST_PARSE_FAIL))) {
- VIR_TEST_DEBUG("\nfailed to parse '%s'\n", data->infile);
+ VIR_TEST_DEBUG("\nfailed to parse '%s'", data->infile);
goto cleanup;
}
VIR_DOMAIN_DEF_FORMAT_ACTUAL_NET |
VIR_DOMAIN_DEF_FORMAT_PCI_ORIG_STATES |
VIR_DOMAIN_DEF_FORMAT_CLOCK_ADJUST))) {
- VIR_TEST_DEBUG("\nfailed to format back '%s'\n", data->infile);
+ VIR_TEST_DEBUG("\nfailed to format back '%s'", data->infile);
goto cleanup;
}
case VIR_STORAGE_POOL_FS:
case VIR_STORAGE_POOL_NETFS:
if (!(pool = virStoragePoolObjNew())) {
- VIR_TEST_DEBUG("pool type '%s' alloc pool obj fails\n", defTypeStr);
+ VIR_TEST_DEBUG("pool type '%s' alloc pool obj fails", defTypeStr);
goto cleanup;
}
virStoragePoolObjSetDef(pool, def);
if (!(src = virStorageBackendFileSystemGetPoolSource(pool))) {
- VIR_TEST_DEBUG("pool type '%s' has no pool source\n", defTypeStr);
+ VIR_TEST_DEBUG("pool type '%s' has no pool source", defTypeStr);
def = NULL;
goto cleanup;
}
case VIR_STORAGE_POOL_VSTORAGE:
case VIR_STORAGE_POOL_LAST:
default:
- VIR_TEST_DEBUG("pool type '%s' has no xml2argv test\n", defTypeStr);
+ VIR_TEST_DEBUG("pool type '%s' has no xml2argv test", defTypeStr);
goto cleanup;
};
if (!(actualCmdline = virCommandToString(cmd, false))) {
- VIR_TEST_DEBUG("pool type '%s' failed to get commandline\n", defTypeStr);
+ VIR_TEST_DEBUG("pool type '%s' failed to get commandline", defTypeStr);
goto cleanup;
}
fprintf(stderr, "Usage: %s\n", argv[0]);
fputs("effective environment variables:\n"
"VIR_TEST_VERBOSE set to show names of individual tests\n"
- "VIR_TEST_DEBUG set to show information for debugging failures\n",
+ "VIR_TEST_DEBUG set to show information for debugging failures",
stderr);
return EXIT_FAILURE;
}
unsigned int virTestGetExpensive(void);
unsigned int virTestGetRegenerate(void);
-#define VIR_TEST_DEBUG(...) \
+#define VIR_TEST_DEBUG(fmt, ...) \
do { \
if (virTestGetDebug()) \
- fprintf(stderr, __VA_ARGS__); \
+ fprintf(stderr, fmt "\n", ## __VA_ARGS__); \
} while (0)
#define VIR_TEST_VERBOSE(...) \
continue;
if (virParseVersionString(tmp, &ver, false) < 0) {
- VIR_TEST_DEBUG("skipping caps file '%s'\n", ent->d_name);
+ VIR_TEST_DEBUG("skipping caps file '%s'", ent->d_name);
continue;
}
return NULL;
}
- VIR_TEST_DEBUG("replies file: '%s'\n", capsLatestFile);
+ VIR_TEST_DEBUG("replies file: '%s'", capsLatestFile);
if (virTestLoadFile(capsLatestFile, &capsLatest) < 0)
goto cleanup;
idx = virDiskNameToIndex(diskName);
if (idx < 0 || idx != i) {
- VIR_TEST_DEBUG("\nExpect [%zu]\n", i);
- VIR_TEST_DEBUG("Actual [%d]\n", idx);
+ VIR_TEST_DEBUG("\nExpect [%zu]", i);
+ VIR_TEST_DEBUG("Actual [%d]", idx);
VIR_FREE(diskName);
return -1;
if (disk->idx != idx) {
- VIR_TEST_DEBUG("\nExpect [%d]\n", disk->idx);
- VIR_TEST_DEBUG("Actual [%d]\n", idx);
+ VIR_TEST_DEBUG("\nExpect [%d]", disk->idx);
+ VIR_TEST_DEBUG("Actual [%d]", idx);
return -1;
}
if (disk->partition != partition) {
- VIR_TEST_DEBUG("\nExpect [%d]\n", disk->partition);
- VIR_TEST_DEBUG("Actual [%d]\n", partition);
+ VIR_TEST_DEBUG("\nExpect [%d]", disk->partition);
+ VIR_TEST_DEBUG("Actual [%d]", partition);
return -1;
}
}
for (i = 0; i < ARRAY_CARDINALITY(diskNamesInvalid); ++i) {
if (!virDiskNameParse(diskNamesInvalid[i], &idx, &partition)) {
- VIR_TEST_DEBUG("Should Fail [%s]\n", diskNamesInvalid[i]);
+ VIR_TEST_DEBUG("Should Fail [%s]", diskNamesInvalid[i]);
return -1;
}
}
versions[i].allowMissing);
if (result != versions[i].result) {
- VIR_TEST_DEBUG("\nVersion string [%s]\n", versions[i].string);
- VIR_TEST_DEBUG("Expect result [%d]\n", versions[i].result);
- VIR_TEST_DEBUG("Actual result [%d]\n", result);
+ VIR_TEST_DEBUG("\nVersion string [%s]", versions[i].string);
+ VIR_TEST_DEBUG("Expect result [%d]", versions[i].result);
+ VIR_TEST_DEBUG("Actual result [%d]", result);
return -1;
}
continue;
if (version != versions[i].version) {
- VIR_TEST_DEBUG("\nVersion string [%s]\n", versions[i].string);
- VIR_TEST_DEBUG("Expect version [%lu]\n", versions[i].version);
- VIR_TEST_DEBUG("Actual version [%lu]\n", version);
+ VIR_TEST_DEBUG("\nVersion string [%s]", versions[i].string);
+ VIR_TEST_DEBUG("Expect version [%lu]", versions[i].version);
+ VIR_TEST_DEBUG("Actual version [%lu]", version);
return -1;
}
for (i = 0; i < ARRAY_CARDINALITY(roundData); i++) {
result = VIR_ROUND_UP_POWER_OF_TWO(roundData[i].input);
if (roundData[i].output != result) {
- VIR_TEST_DEBUG("\nInput number [%u]\n", roundData[i].input);
- VIR_TEST_DEBUG("Expected number [%u]\n", roundData[i].output);
- VIR_TEST_DEBUG("Actual number [%u]\n", result);
+ VIR_TEST_DEBUG("\nInput number [%u]", roundData[i].input);
+ VIR_TEST_DEBUG("Expected number [%u]", roundData[i].output);
+ VIR_TEST_DEBUG("Actual number [%u]", result);
return -1;
}
}
if (STRNEQ_NULLABLE(actual, data->expect)) {
- VIR_TEST_DEBUG("testBufAddStr(): Strings don't match:\n");
+ VIR_TEST_DEBUG("testBufAddStr(): Strings don't match:");
virTestDifference(stderr, data->expect, actual);
goto cleanup;
}
}
if (STRNEQ_NULLABLE(actual, data->expect)) {
- VIR_TEST_DEBUG("testBufEscapeStr(): Strings don't match:\n");
+ VIR_TEST_DEBUG("testBufEscapeStr(): Strings don't match:");
virTestDifference(stderr, data->expect, actual);
goto cleanup;
}
}
if (STRNEQ_NULLABLE(actual, data->expect)) {
- VIR_TEST_DEBUG("testBufEscapeRegex: Strings don't match:\n");
+ VIR_TEST_DEBUG("testBufEscapeRegex: Strings don't match:");
virTestDifference(stderr, data->expect, actual);
goto cleanup;
}
goto cleanup;
if (STRNEQ(actual, " test\n test2\n")) {
- VIR_TEST_DEBUG("testBufSetIndent: expected indent not set\n");
+ VIR_TEST_DEBUG("testBufSetIndent: expected indent not set");
goto cleanup;
}
&nodeinfo.cores, &nodeinfo.threads) < 0) {
if (virTestGetDebug()) {
if (virGetLastErrorCode())
- VIR_TEST_DEBUG("\n%s\n", virGetLastErrorMessage());
+ VIR_TEST_DEBUG("\n%s", virGetLastErrorMessage());
}
VIR_FORCE_FCLOSE(cpuinfo);
goto fail;
VIR_TEST_VERBOSE("Failed to parse %s\n", info->doc);
return -1;
} else {
- VIR_TEST_DEBUG("As expected, failed to parse %s\n", info->doc);
+ VIR_TEST_DEBUG("As expected, failed to parse %s", info->doc);
return 0;
}
} else {
VIR_TEST_VERBOSE("Failed to parse %s\n", info->doc);
return -1;
} else {
- VIR_TEST_DEBUG("As expected, failed to parse %s\n", info->doc);
+ VIR_TEST_DEBUG("As expected, failed to parse %s", info->doc);
return 0;
}
} else {
}
}
- VIR_TEST_DEBUG("Parsed %s\n", info->doc);
+ VIR_TEST_DEBUG("Parsed %s", info->doc);
if (!(formatted = virJSONValueToString(json, false))) {
VIR_TEST_VERBOSE("Failed to format json data\n");
bool got = virLogProbablyLogMessage(data->str);
if (got != data->pass) {
- VIR_TEST_DEBUG("Expected '%d' but got '%d' for '%s'\n",
+ VIR_TEST_DEBUG("Expected '%d' but got '%d' for '%s'",
data->pass, got, data->str);
return -1;
}
noutputs = virLogParseOutputs(data->str, &outputs);
if (noutputs < 0) {
if (!data->pass) {
- VIR_TEST_DEBUG("Got expected error: %s\n",
+ VIR_TEST_DEBUG("Got expected error: %s",
virGetLastErrorMessage());
virResetLastError();
ret = 0;
}
} else if (noutputs != data->count) {
VIR_TEST_DEBUG("Expected number of parsed outputs is %d, "
- "but got %d\n", data->count, noutputs);
+ "but got %d", data->count, noutputs);
goto cleanup;
} else if (!data->pass) {
- VIR_TEST_DEBUG("Test should have failed\n");
+ VIR_TEST_DEBUG("Test should have failed");
goto cleanup;
}
nfilters = virLogParseFilters(data->str, &filters);
if (nfilters < 0) {
if (!data->pass) {
- VIR_TEST_DEBUG("Got expected error: %s\n",
+ VIR_TEST_DEBUG("Got expected error: %s",
virGetLastErrorMessage());
virResetLastError();
ret = 0;
}
} else if (nfilters != data->count) {
VIR_TEST_DEBUG("Expected number of parsed outputs is %d, "
- "but got %d\n", data->count, nfilters);
+ "but got %d", data->count, nfilters);
goto cleanup;
} else if (!data->pass) {
- VIR_TEST_DEBUG("Test should have failed\n");
+ VIR_TEST_DEBUG("Test should have failed");
goto cleanup;
}
cleanup:
if (ret < 0) {
if (!data->pass) {
- VIR_TEST_DEBUG("Got expected error: %s\n",
+ VIR_TEST_DEBUG("Got expected error: %s",
virGetLastErrorMessage());
virResetLastError();
ret = 0;
}
} else if (!data->pass) {
- VIR_TEST_DEBUG("Test should have failed\n");
+ VIR_TEST_DEBUG("Test should have failed");
ret = -1;
}
VIR_FREE(infile);
char *fakerootdir;
if (VIR_STRDUP_QUIET(fakerootdir, FAKEROOTDIRTEMPLATE) < 0) {
- VIR_TEST_DEBUG("Out of memory\n");
+ VIR_TEST_DEBUG("Out of memory");
abort();
}
ret = 0;
goto cleanup;
} else if (data->fail) {
- VIR_TEST_DEBUG("Error expected but there wasn't any.\n");
+ VIR_TEST_DEBUG("Error expected but there wasn't any.");
ret = -1;
goto cleanup;
}