We now have specific tests for the backing store parser and previous tests cover the extraction of the backing store string so there's no need for these particular tests. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- tests/virstoragetest.c | 31 ------------------------------- 1 file changed, 31 deletions(-) diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c index ab34f2f3be..f6af1a17ac 100644 --- a/tests/virstoragetest.c +++ b/tests/virstoragetest.c @@ -651,25 +651,6 @@ mymain(void) TEST_CHAIN(absqcow2, VIR_STORAGE_FILE_QCOW2, (&qcow2), EXP_FAIL); - /* Rewrite qcow2 to use an nbd: protocol as backend */ - virCommandFree(cmd); - cmd = virCommandNewArgList(qemuimg, "rebase", "-u", "-f", "qcow2", - "-F", "raw", "-b", "nbd:example.org:6000:exportname=blah", - "qcow2", NULL); - if (virCommandRun(cmd, NULL) < 0) - ret = -1; - qcow2.expBackingStoreRaw = "nbd:example.org:6000:exportname=blah"; - - /* Qcow2 file with backing protocol instead of file */ - testFileData nbd = { - .path = "blah", - .type = VIR_STORAGE_TYPE_NETWORK, - .format = VIR_STORAGE_FILE_RAW, - .protocol = VIR_STORAGE_NET_PROTOCOL_NBD, - .hostname = "example.org", - }; - TEST_CHAIN(absqcow2, VIR_STORAGE_FILE_QCOW2, (&qcow2, &nbd), EXP_PASS); - /* Rewrite qcow2 to use an nbd: protocol as backend */ virCommandFree(cmd); cmd = virCommandNewArgList(qemuimg, "rebase", "-u", "-f", "qcow2", @@ -689,18 +670,6 @@ mymain(void) }; TEST_CHAIN(absqcow2, VIR_STORAGE_FILE_QCOW2, (&qcow2, &nbd2), EXP_PASS); - /* Rewrite qcow2 to use an nbd: protocol without path as backend */ - virCommandFree(cmd); - cmd = virCommandNewArgList(qemuimg, "rebase", "-u", "-f", "qcow2", - "-F", "raw", "-b", "nbd://example.org", - "qcow2", NULL); - if (virCommandRun(cmd, NULL) < 0) - ret = -1; - qcow2.expBackingStoreRaw = "nbd://example.org"; - - nbd2.path = NULL; - TEST_CHAIN(absqcow2, VIR_STORAGE_FILE_QCOW2, (&qcow2, &nbd2), EXP_PASS); - /* qed file */ testFileData qed = { .expBackingStoreRaw = absraw, -- 2.31.1

The TEST_CHAIN cases were storing the expected output (or rather data to generate the expected output) in code. This made the code really hard to follow and even harder to modify to add new cases. This patch modifies the code to store the expected output in text files (using the same generator as we've used to) and uses 'virTestCompareToFile' to check the outputs. The result is that the code is way simpler and doesn't require fiddling with 'testFileData' structs when adding new cases. Additionally this removes mixing of code and declaration so we can stop disabling the warning for this file. Another advantage is that the tests are now named so it's easier to figure out if one of them breaks. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- tests/virstoragetest.c | 252 ++++-------------- tests/virstoragetestdata/out/directory-dir | 9 + tests/virstoragetestdata/out/directory-none | 9 + tests/virstoragetestdata/out/directory-raw | 9 + .../virstoragetestdata/out/qcow2-auto_raw-raw | 9 + .../out/qcow2-auto_raw-raw-relative | 9 + .../out/qcow2-qcow2_nbd-raw | 19 ++ .../out/qcow2-qcow2_qcow2-qcow2_raw-raw | 29 ++ .../out/qcow2-qcow2_raw-raw | 19 ++ .../out/qcow2-qcow2_raw-raw-relative | 19 ++ tests/virstoragetestdata/out/qcow2-symlinks | 29 ++ tests/virstoragetestdata/out/qed-auto_raw | 9 + tests/virstoragetestdata/out/qed-qed_raw | 19 ++ tests/virstoragetestdata/out/raw-auto | 9 + tests/virstoragetestdata/out/raw-raw | 9 + 15 files changed, 263 insertions(+), 195 deletions(-) create mode 100644 tests/virstoragetestdata/out/directory-dir create mode 100644 tests/virstoragetestdata/out/directory-none create mode 100644 tests/virstoragetestdata/out/directory-raw create mode 100644 tests/virstoragetestdata/out/qcow2-auto_raw-raw create mode 100644 tests/virstoragetestdata/out/qcow2-auto_raw-raw-relative create mode 100644 tests/virstoragetestdata/out/qcow2-qcow2_nbd-raw create mode 100644 tests/virstoragetestdata/out/qcow2-qcow2_qcow2-qcow2_raw-raw create mode 100644 tests/virstoragetestdata/out/qcow2-qcow2_raw-raw create mode 100644 tests/virstoragetestdata/out/qcow2-qcow2_raw-raw-relative create mode 100644 tests/virstoragetestdata/out/qcow2-symlinks create mode 100644 tests/virstoragetestdata/out/qed-auto_raw create mode 100644 tests/virstoragetestdata/out/qed-qed_raw create mode 100644 tests/virstoragetestdata/out/raw-auto create mode 100644 tests/virstoragetestdata/out/raw-raw diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c index f6af1a17ac..4f4fd4e824 100644 --- a/tests/virstoragetest.c +++ b/tests/virstoragetest.c @@ -218,26 +218,6 @@ testPrepImages(void) goto cleanup; } -/* Many fields of virStorageFileMetadata have the same content whether - * we access the file relatively or absolutely; but file names differ - * depending on how the chain was opened. For ease of testing, we - * test both relative and absolute starts, and use a flag to say which - * of the two variations to compare against. */ -typedef struct _testFileData testFileData; -struct _testFileData -{ - const char *expBackingStoreRaw; - unsigned long long expCapacity; - bool expEncrypted; - const char *pathRel; - const char *path; - int type; - int format; - const char *secret; - const char *hostname; - int protocol; -}; - enum { EXP_PASS = 0, EXP_FAIL = 1, @@ -245,33 +225,23 @@ enum { struct testChainData { + const char *testname; const char *start; virStorageFileFormat format; - const testFileData *files[4]; - int nfiles; unsigned int flags; }; -static const char testStorageChainFormat[] = - "chain member: %zu\n" - "path:%s\n" - "backingStoreRaw: %s\n" - "capacity: %lld\n" - "encryption: %d\n" - "relPath:%s\n" - "type:%d\n" - "format:%d\n" - "protocol:%s\n" - "hostname:%s\n"; - static int testStorageChain(const void *args) { const struct testChainData *data = args; virStorageSource *elt; - size_t i = 0; g_autoptr(virStorageSource) meta = NULL; + g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; + g_autofree char *actual = NULL; + g_autofree char *expectpath = g_strdup_printf("%s/virstoragetestdata/out/%s", + abs_srcdir, data->testname); meta = testStorageFileGetMetadata(data->start, data->format, -1, -1); if (!meta) { @@ -290,47 +260,38 @@ testStorageChain(const void *args) return -1; } - elt = meta; - while (virStorageSourceIsBacking(elt)) { - g_autofree char *expect = NULL; - g_autofree char *actual = NULL; + for (elt = meta; virStorageSourceIsBacking(elt); elt = elt->backingStore) { + g_autofree char *strippedPath = virTestStablePath(elt->path); + g_autofree char *strippedBackingStoreRaw = virTestStablePath(elt->backingStoreRaw); + g_autofree char *strippedRelPath = virTestStablePath(elt->relPath); + + virBufferAsprintf(&buf, + "path:%s\n" + "backingStoreRaw: %s\n" + "capacity: %lld\n" + "encryption: %d\n" + "relPath:%s\n" + "type:%d\n" + "format:%d\n" + "protocol:%s\n" + "hostname:%s\n\n", + strippedPath, + strippedBackingStoreRaw, + elt->capacity, + !!elt->encryption, + strippedRelPath, + elt->type, + elt->format, + virStorageNetProtocolTypeToString(elt->protocol), + NULLSTR(elt->nhosts ? elt->hosts[0].name : NULL)); + } - if (i == data->nfiles) { - fprintf(stderr, "probed chain was too long\n"); - return -1; - } + virBufferTrim(&buf, "\n"); - expect = g_strdup_printf(testStorageChainFormat, i, - NULLSTR(data->files[i]->path), - NULLSTR(data->files[i]->expBackingStoreRaw), - data->files[i]->expCapacity, - data->files[i]->expEncrypted, - NULLSTR(data->files[i]->pathRel), - data->files[i]->type, - data->files[i]->format, - virStorageNetProtocolTypeToString(data->files[i]->protocol), - NULLSTR(data->files[i]->hostname)); - actual = g_strdup_printf(testStorageChainFormat, i, - NULLSTR(elt->path), - NULLSTR(elt->backingStoreRaw), - elt->capacity, - !!elt->encryption, - NULLSTR(elt->relPath), - elt->type, - elt->format, - virStorageNetProtocolTypeToString(elt->protocol), - NULLSTR(elt->nhosts ? elt->hosts[0].name : NULL)); - if (STRNEQ(expect, actual)) { - virTestDifference(stderr, expect, actual); - return -1; - } - elt = elt->backingStore; - i++; - } - if (i != data->nfiles) { - fprintf(stderr, "probed chain was too short\n"); + actual = virBufferContentAndReset(&buf); + + if (virTestCompareToFile(actual, expectpath) < 0) return -1; - } return 0; } @@ -561,59 +522,23 @@ mymain(void) if ((ret = testPrepImages()) != 0) return ret; -#define TEST_ONE_CHAIN(start, format, flags, ...) \ +#define TEST_CHAIN(testname, start, format, flags) \ do { \ - size_t i; \ - memset(&data, 0, sizeof(data)); \ - data = (struct testChainData){ \ - start, format, { __VA_ARGS__ }, 0, flags, \ - }; \ - for (i = 0; i < G_N_ELEMENTS(data.files); i++) \ - if (data.files[i]) \ - data.nfiles++; \ - if (virTestRun(virTestCounterNext(), \ - testStorageChain, &data) < 0) \ + data = (struct testChainData){ testname, start, format, flags }; \ + if (virTestRun(testname, testStorageChain, &data) < 0) \ ret = -1; \ } while (0) -#define VIR_FLATTEN_2(...) __VA_ARGS__ -#define VIR_FLATTEN_1(_1) VIR_FLATTEN_2 _1 - -#define TEST_CHAIN(path, format, chain, flags) \ - TEST_ONE_CHAIN(path, format, flags, VIR_FLATTEN_1(chain)); - - /* The actual tests, in several groups. */ - virTestCounterReset("Storage backing chain "); - /* Missing file */ - TEST_ONE_CHAIN("bogus", VIR_STORAGE_FILE_RAW, EXP_FAIL); + TEST_CHAIN("missing", "bogus", VIR_STORAGE_FILE_RAW, EXP_FAIL); - VIR_WARNINGS_NO_DECLARATION_AFTER_STATEMENT /* Raw image, whether with right format or no specified format */ - testFileData raw = { - .path = absraw, - .type = VIR_STORAGE_TYPE_FILE, - .format = VIR_STORAGE_FILE_RAW, - }; - TEST_CHAIN(absraw, VIR_STORAGE_FILE_RAW, (&raw), EXP_PASS); - TEST_CHAIN(absraw, VIR_STORAGE_FILE_AUTO, (&raw), EXP_PASS); + TEST_CHAIN("raw-raw", absraw, VIR_STORAGE_FILE_RAW, EXP_PASS); + TEST_CHAIN("raw-auto", absraw, VIR_STORAGE_FILE_AUTO, EXP_PASS); /* Qcow2 file with relative raw backing, format provided */ - raw.pathRel = "raw"; - testFileData qcow2 = { - .expBackingStoreRaw = "raw", - .expCapacity = 1024, - .path = absqcow2, - .type = VIR_STORAGE_TYPE_FILE, - .format = VIR_STORAGE_FILE_QCOW2, - }; - testFileData qcow2_as_raw = { - .path = absqcow2, - .type = VIR_STORAGE_TYPE_FILE, - .format = VIR_STORAGE_FILE_RAW, - }; - TEST_CHAIN(absqcow2, VIR_STORAGE_FILE_QCOW2, (&qcow2, &raw), EXP_PASS); - TEST_CHAIN(absqcow2, VIR_STORAGE_FILE_AUTO, (&qcow2_as_raw), EXP_PASS); + TEST_CHAIN("qcow2-qcow2_raw-raw-relative", absqcow2, VIR_STORAGE_FILE_QCOW2, EXP_PASS); + TEST_CHAIN("qcow2-auto_raw-raw-relative", absqcow2, VIR_STORAGE_FILE_AUTO, EXP_PASS); /* Rewrite qcow2 file to use absolute backing name */ virCommandFree(cmd); @@ -621,22 +546,13 @@ mymain(void) "-F", "raw", "-b", absraw, "qcow2", NULL); if (virCommandRun(cmd, NULL) < 0) ret = -1; - qcow2.expBackingStoreRaw = absraw; - raw.pathRel = NULL; /* Qcow2 file with raw as absolute backing, backing format provided */ - TEST_CHAIN(absqcow2, VIR_STORAGE_FILE_QCOW2, (&qcow2, &raw), EXP_PASS); - TEST_CHAIN(absqcow2, VIR_STORAGE_FILE_AUTO, (&qcow2_as_raw), EXP_PASS); - - /* Wrapped file access */ - testFileData wrap = { - .expBackingStoreRaw = absqcow2, - .expCapacity = 1024, - .path = abswrap, - .type = VIR_STORAGE_TYPE_FILE, - .format = VIR_STORAGE_FILE_QCOW2, - }; - TEST_CHAIN(abswrap, VIR_STORAGE_FILE_QCOW2, (&wrap, &qcow2, &raw), EXP_PASS); + TEST_CHAIN("qcow2-qcow2_raw-raw", absqcow2, VIR_STORAGE_FILE_QCOW2, EXP_PASS); + TEST_CHAIN("qcow2-auto_raw-raw", absqcow2, VIR_STORAGE_FILE_AUTO, EXP_PASS); + + /* qcow2 with a longer backing chain */ + TEST_CHAIN("qcow2-qcow2_qcow2-qcow2_raw-raw", abswrap, VIR_STORAGE_FILE_QCOW2, EXP_PASS); /* Rewrite qcow2 to a missing backing file, with backing type */ virCommandFree(cmd); @@ -645,10 +561,9 @@ mymain(void) "qcow2", NULL); if (virCommandRun(cmd, NULL) < 0) ret = -1; - qcow2.expBackingStoreRaw = datadir "/bogus"; /* Qcow2 file with missing backing file but specified type */ - TEST_CHAIN(absqcow2, VIR_STORAGE_FILE_QCOW2, (&qcow2), EXP_FAIL); + TEST_CHAIN("qcow2-qcow2_missing", absqcow2, VIR_STORAGE_FILE_QCOW2, EXP_FAIL); /* Rewrite qcow2 to use an nbd: protocol as backend */ @@ -658,48 +573,18 @@ mymain(void) "qcow2", NULL); if (virCommandRun(cmd, NULL) < 0) ret = -1; - qcow2.expBackingStoreRaw = "nbd+tcp://example.org:6000/blah"; /* Qcow2 file with backing protocol instead of file */ - testFileData nbd2 = { - .path = "blah", - .type = VIR_STORAGE_TYPE_NETWORK, - .format = VIR_STORAGE_FILE_RAW, - .protocol = VIR_STORAGE_NET_PROTOCOL_NBD, - .hostname = "example.org", - }; - TEST_CHAIN(absqcow2, VIR_STORAGE_FILE_QCOW2, (&qcow2, &nbd2), EXP_PASS); + TEST_CHAIN("qcow2-qcow2_nbd-raw", absqcow2, VIR_STORAGE_FILE_QCOW2, EXP_PASS); /* qed file */ - testFileData qed = { - .expBackingStoreRaw = absraw, - .expCapacity = 1024, - .path = absqed, - .type = VIR_STORAGE_TYPE_FILE, - .format = VIR_STORAGE_FILE_QED, - }; - testFileData qed_as_raw = { - .path = absqed, - .type = VIR_STORAGE_TYPE_FILE, - .format = VIR_STORAGE_FILE_RAW, - }; - TEST_CHAIN(absqed, VIR_STORAGE_FILE_QED, (&qed, &raw), EXP_PASS); - TEST_CHAIN(absqed, VIR_STORAGE_FILE_AUTO, (&qed_as_raw), EXP_PASS); + TEST_CHAIN("qed-qed_raw", absqed, VIR_STORAGE_FILE_QED, EXP_PASS); + TEST_CHAIN("qed-auto_raw", absqed, VIR_STORAGE_FILE_AUTO, EXP_PASS); /* directory */ - testFileData dir = { - .path = absdir, - .type = VIR_STORAGE_TYPE_DIR, - .format = VIR_STORAGE_FILE_DIR, - }; - testFileData dir_as_raw = { - .path = absdir, - .type = VIR_STORAGE_TYPE_DIR, - .format = VIR_STORAGE_FILE_RAW, - }; - TEST_CHAIN(absdir, VIR_STORAGE_FILE_RAW, (&dir_as_raw), EXP_PASS); - TEST_CHAIN(absdir, VIR_STORAGE_FILE_NONE, (&dir), EXP_PASS); - TEST_CHAIN(absdir, VIR_STORAGE_FILE_DIR, (&dir), EXP_PASS); + TEST_CHAIN("directory-raw", absdir, VIR_STORAGE_FILE_RAW, EXP_PASS); + TEST_CHAIN("directory-none", absdir, VIR_STORAGE_FILE_NONE, EXP_PASS); + TEST_CHAIN("directory-dir", absdir, VIR_STORAGE_FILE_DIR, EXP_PASS); #ifdef WITH_SYMLINK /* Rewrite qcow2 and wrap file to use backing names relative to a @@ -718,26 +603,7 @@ mymain(void) ret = -1; /* Behavior of symlinks to qcow2 with relative backing files */ - testFileData link1 = { - .expBackingStoreRaw = "../raw", - .expCapacity = 1024, - .pathRel = "../sub/link1", - .path = datadir "/sub/../sub/link1", - .type = VIR_STORAGE_TYPE_FILE, - .format = VIR_STORAGE_FILE_QCOW2, - }; - testFileData link2 = { - .expBackingStoreRaw = "../sub/link1", - .expCapacity = 1024, - .path = abslink2, - .type = VIR_STORAGE_TYPE_FILE, - .format = VIR_STORAGE_FILE_QCOW2, - }; - - raw.path = datadir "/sub/../sub/../raw"; - raw.pathRel = "../raw"; - TEST_CHAIN(abslink2, VIR_STORAGE_FILE_QCOW2, - (&link2, &link1, &raw), EXP_PASS); + TEST_CHAIN("qcow2-symlinks", abslink2, VIR_STORAGE_FILE_QCOW2, EXP_PASS); #endif /* Rewrite qcow2 to be a self-referential loop */ @@ -746,10 +612,9 @@ mymain(void) "-F", "qcow2", "-b", "qcow2", "qcow2", NULL); if (virCommandRun(cmd, NULL) < 0) ret = -1; - qcow2.expBackingStoreRaw = "qcow2"; /* Behavior of an infinite loop chain */ - TEST_CHAIN(absqcow2, VIR_STORAGE_FILE_QCOW2, (&qcow2), EXP_FAIL); + TEST_CHAIN("qcow2-qcow2_infinite-self", absqcow2, VIR_STORAGE_FILE_QCOW2, EXP_FAIL); /* Rewrite wrap and qcow2 to be mutually-referential loop */ virCommandFree(cmd); @@ -763,12 +628,9 @@ mymain(void) "-F", "qcow2", "-b", absqcow2, "wrap", NULL); if (virCommandRun(cmd, NULL) < 0) ret = -1; - qcow2.expBackingStoreRaw = "wrap"; /* Behavior of an infinite loop chain */ - TEST_CHAIN(abswrap, VIR_STORAGE_FILE_QCOW2, (&wrap, &qcow2), EXP_FAIL); - - VIR_WARNINGS_RESET + TEST_CHAIN("qcow2-qcow2_infinite-mutual", abswrap, VIR_STORAGE_FILE_QCOW2, EXP_FAIL); /* Rewrite wrap and qcow2 back to 3-deep chain, absolute backing */ virCommandFree(cmd); diff --git a/tests/virstoragetestdata/out/directory-dir b/tests/virstoragetestdata/out/directory-dir new file mode 100644 index 0000000000..cff67595b4 --- /dev/null +++ b/tests/virstoragetestdata/out/directory-dir @@ -0,0 +1,9 @@ +path:ABS_BUILDDIR/virstoragedata/dir +backingStoreRaw: <null> +capacity: 0 +encryption: 0 +relPath:<null> +type:3 +format:2 +protocol:none +hostname:<null> diff --git a/tests/virstoragetestdata/out/directory-none b/tests/virstoragetestdata/out/directory-none new file mode 100644 index 0000000000..cff67595b4 --- /dev/null +++ b/tests/virstoragetestdata/out/directory-none @@ -0,0 +1,9 @@ +path:ABS_BUILDDIR/virstoragedata/dir +backingStoreRaw: <null> +capacity: 0 +encryption: 0 +relPath:<null> +type:3 +format:2 +protocol:none +hostname:<null> diff --git a/tests/virstoragetestdata/out/directory-raw b/tests/virstoragetestdata/out/directory-raw new file mode 100644 index 0000000000..ebe23cbbd6 --- /dev/null +++ b/tests/virstoragetestdata/out/directory-raw @@ -0,0 +1,9 @@ +path:ABS_BUILDDIR/virstoragedata/dir +backingStoreRaw: <null> +capacity: 0 +encryption: 0 +relPath:<null> +type:3 +format:1 +protocol:none +hostname:<null> diff --git a/tests/virstoragetestdata/out/qcow2-auto_raw-raw b/tests/virstoragetestdata/out/qcow2-auto_raw-raw new file mode 100644 index 0000000000..4a01b24589 --- /dev/null +++ b/tests/virstoragetestdata/out/qcow2-auto_raw-raw @@ -0,0 +1,9 @@ +path:ABS_BUILDDIR/virstoragedata/qcow2 +backingStoreRaw: <null> +capacity: 0 +encryption: 0 +relPath:<null> +type:1 +format:1 +protocol:none +hostname:<null> diff --git a/tests/virstoragetestdata/out/qcow2-auto_raw-raw-relative b/tests/virstoragetestdata/out/qcow2-auto_raw-raw-relative new file mode 100644 index 0000000000..4a01b24589 --- /dev/null +++ b/tests/virstoragetestdata/out/qcow2-auto_raw-raw-relative @@ -0,0 +1,9 @@ +path:ABS_BUILDDIR/virstoragedata/qcow2 +backingStoreRaw: <null> +capacity: 0 +encryption: 0 +relPath:<null> +type:1 +format:1 +protocol:none +hostname:<null> diff --git a/tests/virstoragetestdata/out/qcow2-qcow2_nbd-raw b/tests/virstoragetestdata/out/qcow2-qcow2_nbd-raw new file mode 100644 index 0000000000..64acdb880a --- /dev/null +++ b/tests/virstoragetestdata/out/qcow2-qcow2_nbd-raw @@ -0,0 +1,19 @@ +path:ABS_BUILDDIR/virstoragedata/qcow2 +backingStoreRaw: nbd+tcp://example.org:6000/blah +capacity: 1024 +encryption: 0 +relPath:<null> +type:1 +format:14 +protocol:none +hostname:<null> + +path:blah +backingStoreRaw: <null> +capacity: 0 +encryption: 0 +relPath:<null> +type:4 +format:1 +protocol:nbd +hostname:example.org diff --git a/tests/virstoragetestdata/out/qcow2-qcow2_qcow2-qcow2_raw-raw b/tests/virstoragetestdata/out/qcow2-qcow2_qcow2-qcow2_raw-raw new file mode 100644 index 0000000000..5f93fe746b --- /dev/null +++ b/tests/virstoragetestdata/out/qcow2-qcow2_qcow2-qcow2_raw-raw @@ -0,0 +1,29 @@ +path:ABS_BUILDDIR/virstoragedata/wrap +backingStoreRaw: ABS_BUILDDIR/virstoragedata/qcow2 +capacity: 1024 +encryption: 0 +relPath:<null> +type:1 +format:14 +protocol:none +hostname:<null> + +path:ABS_BUILDDIR/virstoragedata/qcow2 +backingStoreRaw: ABS_BUILDDIR/virstoragedata/raw +capacity: 1024 +encryption: 0 +relPath:<null> +type:1 +format:14 +protocol:none +hostname:<null> + +path:ABS_BUILDDIR/virstoragedata/raw +backingStoreRaw: <null> +capacity: 0 +encryption: 0 +relPath:<null> +type:1 +format:1 +protocol:none +hostname:<null> diff --git a/tests/virstoragetestdata/out/qcow2-qcow2_raw-raw b/tests/virstoragetestdata/out/qcow2-qcow2_raw-raw new file mode 100644 index 0000000000..57ce62a376 --- /dev/null +++ b/tests/virstoragetestdata/out/qcow2-qcow2_raw-raw @@ -0,0 +1,19 @@ +path:ABS_BUILDDIR/virstoragedata/qcow2 +backingStoreRaw: ABS_BUILDDIR/virstoragedata/raw +capacity: 1024 +encryption: 0 +relPath:<null> +type:1 +format:14 +protocol:none +hostname:<null> + +path:ABS_BUILDDIR/virstoragedata/raw +backingStoreRaw: <null> +capacity: 0 +encryption: 0 +relPath:<null> +type:1 +format:1 +protocol:none +hostname:<null> diff --git a/tests/virstoragetestdata/out/qcow2-qcow2_raw-raw-relative b/tests/virstoragetestdata/out/qcow2-qcow2_raw-raw-relative new file mode 100644 index 0000000000..a1fb142e98 --- /dev/null +++ b/tests/virstoragetestdata/out/qcow2-qcow2_raw-raw-relative @@ -0,0 +1,19 @@ +path:ABS_BUILDDIR/virstoragedata/qcow2 +backingStoreRaw: raw +capacity: 1024 +encryption: 0 +relPath:<null> +type:1 +format:14 +protocol:none +hostname:<null> + +path:ABS_BUILDDIR/virstoragedata/raw +backingStoreRaw: <null> +capacity: 0 +encryption: 0 +relPath:raw +type:1 +format:1 +protocol:none +hostname:<null> diff --git a/tests/virstoragetestdata/out/qcow2-symlinks b/tests/virstoragetestdata/out/qcow2-symlinks new file mode 100644 index 0000000000..ed37f61e9f --- /dev/null +++ b/tests/virstoragetestdata/out/qcow2-symlinks @@ -0,0 +1,29 @@ +path:ABS_BUILDDIR/virstoragedata/sub/link2 +backingStoreRaw: ../sub/link1 +capacity: 1024 +encryption: 0 +relPath:<null> +type:1 +format:14 +protocol:none +hostname:<null> + +path:ABS_BUILDDIR/virstoragedata/sub/../sub/link1 +backingStoreRaw: ../raw +capacity: 1024 +encryption: 0 +relPath:../sub/link1 +type:1 +format:14 +protocol:none +hostname:<null> + +path:ABS_BUILDDIR/virstoragedata/sub/../sub/../raw +backingStoreRaw: <null> +capacity: 0 +encryption: 0 +relPath:../raw +type:1 +format:1 +protocol:none +hostname:<null> diff --git a/tests/virstoragetestdata/out/qed-auto_raw b/tests/virstoragetestdata/out/qed-auto_raw new file mode 100644 index 0000000000..e8ab498038 --- /dev/null +++ b/tests/virstoragetestdata/out/qed-auto_raw @@ -0,0 +1,9 @@ +path:ABS_BUILDDIR/virstoragedata/qed +backingStoreRaw: <null> +capacity: 0 +encryption: 0 +relPath:<null> +type:1 +format:1 +protocol:none +hostname:<null> diff --git a/tests/virstoragetestdata/out/qed-qed_raw b/tests/virstoragetestdata/out/qed-qed_raw new file mode 100644 index 0000000000..70a75c4e37 --- /dev/null +++ b/tests/virstoragetestdata/out/qed-qed_raw @@ -0,0 +1,19 @@ +path:ABS_BUILDDIR/virstoragedata/qed +backingStoreRaw: ABS_BUILDDIR/virstoragedata/raw +capacity: 1024 +encryption: 0 +relPath:<null> +type:1 +format:15 +protocol:none +hostname:<null> + +path:ABS_BUILDDIR/virstoragedata/raw +backingStoreRaw: <null> +capacity: 0 +encryption: 0 +relPath:<null> +type:1 +format:1 +protocol:none +hostname:<null> diff --git a/tests/virstoragetestdata/out/raw-auto b/tests/virstoragetestdata/out/raw-auto new file mode 100644 index 0000000000..8d6c525896 --- /dev/null +++ b/tests/virstoragetestdata/out/raw-auto @@ -0,0 +1,9 @@ +path:ABS_BUILDDIR/virstoragedata/raw +backingStoreRaw: <null> +capacity: 0 +encryption: 0 +relPath:<null> +type:1 +format:1 +protocol:none +hostname:<null> diff --git a/tests/virstoragetestdata/out/raw-raw b/tests/virstoragetestdata/out/raw-raw new file mode 100644 index 0000000000..8d6c525896 --- /dev/null +++ b/tests/virstoragetestdata/out/raw-raw @@ -0,0 +1,9 @@ +path:ABS_BUILDDIR/virstoragedata/raw +backingStoreRaw: <null> +capacity: 0 +encryption: 0 +relPath:<null> +type:1 +format:1 +protocol:none +hostname:<null> -- 2.31.1

Rather than using 'qemu-img' and rewriting the chain we can use fake data and few empty files to ensure the same level of coverage. This is possible since we've already tested that the metadata parsing from files works properly and the only thing we are testing here is that the symlink resolution works properly. Additionally after the refactor of 'virstoragetest' is complete additional tests on real data will be added. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- tests/virstoragetest.c | 140 ++++++++++------------ tests/virstoragetestdata/lookup/qcow2 | 0 tests/virstoragetestdata/lookup/raw | 0 tests/virstoragetestdata/lookup/sub/link2 | 1 + tests/virstoragetestdata/lookup/wrap | 0 5 files changed, 63 insertions(+), 78 deletions(-) create mode 100644 tests/virstoragetestdata/lookup/qcow2 create mode 100644 tests/virstoragetestdata/lookup/raw create mode 120000 tests/virstoragetestdata/lookup/sub/link2 create mode 100644 tests/virstoragetestdata/lookup/wrap diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c index a3f9c537e5..299b16e119 100644 --- a/tests/virstoragetest.c +++ b/tests/virstoragetest.c @@ -499,10 +499,11 @@ mymain(void) struct testLookupData data2; struct testPathRelativeBacking data4; struct testBackingParseData data5; - virStorageSource *chain2; /* short for chain->backingStore */ - virStorageSource *chain3; /* short for chain2->backingStore */ + virStorageSource fakeChain[4]; + virStorageSource *chain = &fakeChain[0]; + virStorageSource *chain2 = &fakeChain[1]; + virStorageSource *chain3 = &fakeChain[2]; g_autoptr(virCommand) cmd = NULL; - g_autoptr(virStorageSource) chain = NULL; if (storageRegisterAll() < 0) return EXIT_FAILURE; @@ -622,22 +623,29 @@ mymain(void) /* Behavior of an infinite loop chain */ TEST_CHAIN("qcow2-qcow2_infinite-mutual", abswrap, VIR_STORAGE_FILE_QCOW2, EXP_FAIL); - /* Rewrite wrap and qcow2 back to 3-deep chain, absolute backing */ - virCommandFree(cmd); - cmd = virCommandNewArgList(qemuimg, "rebase", "-u", "-f", "qcow2", - "-F", "raw", "-b", absraw, "qcow2", NULL); - if (virCommandRun(cmd, NULL) < 0) - ret = -1; - - /* Test behavior of chain lookups, absolute backing from relative start */ - chain = testStorageFileGetMetadata("wrap", VIR_STORAGE_FILE_QCOW2, - -1, -1); - if (!chain) { - ret = -1; + /* setup data for backing chain lookup testing */ + if (chdir(abs_srcdir "/virstoragetestdata/lookup") < 0) { + fprintf(stderr, "unable to test relative backing chains\n"); goto cleanup; } - chain2 = chain->backingStore; - chain3 = chain2->backingStore; + + memset(fakeChain, 0, sizeof(fakeChain)); + fakeChain[0].backingStore = &fakeChain[1]; + fakeChain[1].backingStore = &fakeChain[2]; + fakeChain[2].backingStore = &fakeChain[3]; + + fakeChain[0].type = VIR_STORAGE_TYPE_FILE; + fakeChain[1].type = VIR_STORAGE_TYPE_FILE; + fakeChain[2].type = VIR_STORAGE_TYPE_FILE; + + fakeChain[0].format = VIR_STORAGE_FILE_QCOW2; + fakeChain[1].format = VIR_STORAGE_FILE_QCOW2; + fakeChain[2].format = VIR_STORAGE_FILE_RAW; + + /* backing chain with relative start and absolute backing paths */ + fakeChain[0].path = (char *) "wrap"; + fakeChain[1].path = (char *) abs_srcdir "/virstoragetestdata/lookup/qcow2"; + fakeChain[2].path = (char *) abs_srcdir "/virstoragetestdata/lookup/raw"; #define TEST_LOOKUP_TARGET(id, target, from, name, index, meta, parent) \ do { \ @@ -654,111 +662,87 @@ mymain(void) TEST_LOOKUP(2, NULL, "wrap", chain, NULL); TEST_LOOKUP(3, chain, "wrap", NULL, NULL); TEST_LOOKUP(4, chain2, "wrap", NULL, NULL); - TEST_LOOKUP(5, NULL, abswrap, chain, NULL); - TEST_LOOKUP(6, chain, abswrap, NULL, NULL); - TEST_LOOKUP(7, chain2, abswrap, NULL, NULL); + TEST_LOOKUP(5, NULL, abs_srcdir "/virstoragetestdata/lookup/wrap", chain, NULL); + TEST_LOOKUP(6, chain, abs_srcdir "/virstoragetestdata/lookup/wrap", NULL, NULL); + TEST_LOOKUP(7, chain2, abs_srcdir "/virstoragetestdata/lookup/wrap", NULL, NULL); TEST_LOOKUP(8, NULL, "qcow2", chain2, chain); TEST_LOOKUP(9, chain, "qcow2", chain2, chain); TEST_LOOKUP(10, chain2, "qcow2", NULL, NULL); TEST_LOOKUP(11, chain3, "qcow2", NULL, NULL); - TEST_LOOKUP(12, NULL, absqcow2, chain2, chain); - TEST_LOOKUP(13, chain, absqcow2, chain2, chain); - TEST_LOOKUP(14, chain2, absqcow2, NULL, NULL); - TEST_LOOKUP(15, chain3, absqcow2, NULL, NULL); + TEST_LOOKUP(12, NULL, abs_srcdir "/virstoragetestdata/lookup/qcow2", chain2, chain); + TEST_LOOKUP(13, chain, abs_srcdir "/virstoragetestdata/lookup/qcow2", chain2, chain); + TEST_LOOKUP(14, chain2, abs_srcdir "/virstoragetestdata/lookup/qcow2", NULL, NULL); + TEST_LOOKUP(15, chain3, abs_srcdir "/virstoragetestdata/lookup/qcow2", NULL, NULL); TEST_LOOKUP(16, NULL, "raw", chain3, chain2); TEST_LOOKUP(17, chain, "raw", chain3, chain2); TEST_LOOKUP(18, chain2, "raw", chain3, chain2); TEST_LOOKUP(19, chain3, "raw", NULL, NULL); - TEST_LOOKUP(20, NULL, absraw, chain3, chain2); - TEST_LOOKUP(21, chain, absraw, chain3, chain2); - TEST_LOOKUP(22, chain2, absraw, chain3, chain2); - TEST_LOOKUP(23, chain3, absraw, NULL, NULL); + TEST_LOOKUP(20, NULL, abs_srcdir "/virstoragetestdata/lookup/raw", chain3, chain2); + TEST_LOOKUP(21, chain, abs_srcdir "/virstoragetestdata/lookup/raw", chain3, chain2); + TEST_LOOKUP(22, chain2, abs_srcdir "/virstoragetestdata/lookup/raw", chain3, chain2); + TEST_LOOKUP(23, chain3, abs_srcdir "/virstoragetestdata/lookup/raw", NULL, NULL); TEST_LOOKUP(24, NULL, NULL, chain3, chain2); TEST_LOOKUP(25, chain, NULL, chain3, chain2); TEST_LOOKUP(26, chain2, NULL, chain3, chain2); TEST_LOOKUP(27, chain3, NULL, NULL, NULL); - /* Rewrite wrap and qcow2 back to 3-deep chain, relative backing */ - virCommandFree(cmd); - cmd = virCommandNewArgList(qemuimg, "rebase", "-u", "-f", "qcow2", - "-F", "raw", "-b", "raw", "qcow2", NULL); - if (virCommandRun(cmd, NULL) < 0) - ret = -1; + /* relative backing, absolute start */ + fakeChain[0].path = (char *) abs_srcdir "/virstoragetestdata/lookup/wrap"; - virCommandFree(cmd); - cmd = virCommandNewArgList(qemuimg, "rebase", "-u", "-f", "qcow2", - "-F", "qcow2", "-b", "qcow2", "wrap", NULL); - if (virCommandRun(cmd, NULL) < 0) - ret = -1; - - /* Test behavior of chain lookups, relative backing from absolute start */ - virObjectUnref(chain); - chain = testStorageFileGetMetadata(abswrap, VIR_STORAGE_FILE_QCOW2, -1, -1); - if (!chain) { - ret = -1; - goto cleanup; - } - chain2 = chain->backingStore; - chain3 = chain2->backingStore; + fakeChain[1].relPath = (char *) "qcow2"; + fakeChain[2].relPath = (char *) "raw"; TEST_LOOKUP(28, NULL, "bogus", NULL, NULL); TEST_LOOKUP(29, chain, "bogus", NULL, NULL); TEST_LOOKUP(30, NULL, "wrap", chain, NULL); TEST_LOOKUP(31, chain, "wrap", NULL, NULL); TEST_LOOKUP(32, chain2, "wrap", NULL, NULL); - TEST_LOOKUP(33, NULL, abswrap, chain, NULL); - TEST_LOOKUP(34, chain, abswrap, NULL, NULL); - TEST_LOOKUP(35, chain2, abswrap, NULL, NULL); + TEST_LOOKUP(33, NULL, abs_srcdir "/virstoragetestdata/lookup/wrap", chain, NULL); + TEST_LOOKUP(34, chain, abs_srcdir "/virstoragetestdata/lookup/wrap", NULL, NULL); + TEST_LOOKUP(35, chain2, abs_srcdir "/virstoragetestdata/lookup/wrap", NULL, NULL); TEST_LOOKUP(36, NULL, "qcow2", chain2, chain); TEST_LOOKUP(37, chain, "qcow2", chain2, chain); TEST_LOOKUP(38, chain2, "qcow2", NULL, NULL); TEST_LOOKUP(39, chain3, "qcow2", NULL, NULL); - TEST_LOOKUP(40, NULL, absqcow2, chain2, chain); - TEST_LOOKUP(41, chain, absqcow2, chain2, chain); - TEST_LOOKUP(42, chain2, absqcow2, NULL, NULL); - TEST_LOOKUP(43, chain3, absqcow2, NULL, NULL); + TEST_LOOKUP(40, NULL, abs_srcdir "/virstoragetestdata/lookup/qcow2", chain2, chain); + TEST_LOOKUP(41, chain, abs_srcdir "/virstoragetestdata/lookup/qcow2", chain2, chain); + TEST_LOOKUP(42, chain2, abs_srcdir "/virstoragetestdata/lookup/qcow2", NULL, NULL); + TEST_LOOKUP(43, chain3, abs_srcdir "/virstoragetestdata/lookup/qcow2", NULL, NULL); TEST_LOOKUP(44, NULL, "raw", chain3, chain2); TEST_LOOKUP(45, chain, "raw", chain3, chain2); TEST_LOOKUP(46, chain2, "raw", chain3, chain2); TEST_LOOKUP(47, chain3, "raw", NULL, NULL); - TEST_LOOKUP(48, NULL, absraw, chain3, chain2); - TEST_LOOKUP(49, chain, absraw, chain3, chain2); - TEST_LOOKUP(50, chain2, absraw, chain3, chain2); - TEST_LOOKUP(51, chain3, absraw, NULL, NULL); + TEST_LOOKUP(48, NULL, abs_srcdir "/virstoragetestdata/lookup/raw", chain3, chain2); + TEST_LOOKUP(49, chain, abs_srcdir "/virstoragetestdata/lookup/raw", chain3, chain2); + TEST_LOOKUP(50, chain2, abs_srcdir "/virstoragetestdata/lookup/raw", chain3, chain2); + TEST_LOOKUP(51, chain3, abs_srcdir "/virstoragetestdata/lookup/raw", NULL, NULL); TEST_LOOKUP(52, NULL, NULL, chain3, chain2); TEST_LOOKUP(53, chain, NULL, chain3, chain2); TEST_LOOKUP(54, chain2, NULL, chain3, chain2); TEST_LOOKUP(55, chain3, NULL, NULL, NULL); /* Use link to wrap with cross-directory relative backing */ - virCommandFree(cmd); - cmd = virCommandNewArgList(qemuimg, "rebase", "-u", "-f", "qcow2", - "-F", "qcow2", "-b", "../qcow2", "wrap", NULL); - if (virCommandRun(cmd, NULL) < 0) - ret = -1; + fakeChain[0].path = (char *) abs_srcdir "/virstoragetestdata/lookup/sub/link2"; - /* Test behavior of chain lookups, relative backing */ - virObjectUnref(chain); - chain = testStorageFileGetMetadata("sub/link2", VIR_STORAGE_FILE_QCOW2, - -1, -1); - if (!chain) { - ret = -1; - goto cleanup; - } - chain2 = chain->backingStore; - chain3 = chain2->backingStore; + fakeChain[1].relPath = (char *) "../qcow2"; + fakeChain[2].relPath = (char *) "raw"; TEST_LOOKUP(56, NULL, "bogus", NULL, NULL); TEST_LOOKUP(57, NULL, "sub/link2", chain, NULL); TEST_LOOKUP(58, NULL, "wrap", chain, NULL); - TEST_LOOKUP(59, NULL, abswrap, chain, NULL); + TEST_LOOKUP(59, NULL, abs_srcdir "/virstoragetestdata/lookup/wrap", chain, NULL); TEST_LOOKUP(60, NULL, "../qcow2", chain2, chain); TEST_LOOKUP(61, NULL, "qcow2", NULL, NULL); - TEST_LOOKUP(62, NULL, absqcow2, chain2, chain); + TEST_LOOKUP(62, NULL, abs_srcdir "/virstoragetestdata/lookup/qcow2", chain2, chain); TEST_LOOKUP(63, NULL, "raw", chain3, chain2); - TEST_LOOKUP(64, NULL, absraw, chain3, chain2); + TEST_LOOKUP(64, NULL, abs_srcdir "/virstoragetestdata/lookup/raw", chain3, chain2); TEST_LOOKUP(65, NULL, NULL, chain3, chain2); + /* index lookup */ + fakeChain[0].id = 0; + fakeChain[1].id = 1; + fakeChain[2].id = 2; + TEST_LOOKUP_TARGET(66, "vda", NULL, "bogus[1]", 0, NULL, NULL); TEST_LOOKUP_TARGET(67, "vda", NULL, "vda[-1]", 0, NULL, NULL); TEST_LOOKUP_TARGET(68, "vda", NULL, "vda[1][1]", 0, NULL, NULL); diff --git a/tests/virstoragetestdata/lookup/qcow2 b/tests/virstoragetestdata/lookup/qcow2 new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/virstoragetestdata/lookup/raw b/tests/virstoragetestdata/lookup/raw new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/virstoragetestdata/lookup/sub/link2 b/tests/virstoragetestdata/lookup/sub/link2 new file mode 120000 index 0000000000..5efbc33afa --- /dev/null +++ b/tests/virstoragetestdata/lookup/sub/link2 @@ -0,0 +1 @@ +../wrap \ No newline at end of file diff --git a/tests/virstoragetestdata/lookup/wrap b/tests/virstoragetestdata/lookup/wrap new file mode 100644 index 0000000000..e69de29bb2 -- 2.31.1

We don't need a special directory for the tests. Reuse the directory holding the data for the virstoragetest. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- tests/virstoragetest.c | 13 +++---------- tests/virstoragetestdata/out/directory-dir | 2 +- tests/virstoragetestdata/out/directory-none | 2 +- tests/virstoragetestdata/out/directory-raw | 2 +- 4 files changed, 6 insertions(+), 13 deletions(-) diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c index 785699d4e8..3736280611 100644 --- a/tests/virstoragetest.c +++ b/tests/virstoragetest.c @@ -56,7 +56,6 @@ static char *absraw; static char *absqcow2; static char *abswrap; static char *absqed; -static char *absdir; static char *abslink2; static void @@ -67,7 +66,6 @@ testCleanupImages(void) VIR_FREE(absqcow2); VIR_FREE(abswrap); VIR_FREE(absqed); - VIR_FREE(absdir); VIR_FREE(abslink2); if (chdir(abs_builddir) < 0) { @@ -139,17 +137,12 @@ testPrepImages(void) absqcow2 = g_strdup_printf("%s/qcow2", datadir); abswrap = g_strdup_printf("%s/wrap", datadir); absqed = g_strdup_printf("%s/qed", datadir); - absdir = g_strdup_printf("%s/dir", datadir); abslink2 = g_strdup_printf("%s/sub/link2", datadir); if (g_mkdir_with_parents(datadir "/sub", 0777) < 0) { fprintf(stderr, "unable to create directory %s\n", datadir "/sub"); goto cleanup; } - if (g_mkdir_with_parents(datadir "/dir", 0777) < 0) { - fprintf(stderr, "unable to create directory %s\n", datadir "/dir"); - goto cleanup; - } if (chdir(datadir) < 0) { fprintf(stderr, "unable to test relative backing chains\n"); @@ -573,9 +566,9 @@ mymain(void) TEST_CHAIN("qed-auto_raw", absqed, VIR_STORAGE_FILE_AUTO, EXP_PASS); /* directory */ - TEST_CHAIN("directory-raw", absdir, VIR_STORAGE_FILE_RAW, EXP_PASS); - TEST_CHAIN("directory-none", absdir, VIR_STORAGE_FILE_NONE, EXP_PASS); - TEST_CHAIN("directory-dir", absdir, VIR_STORAGE_FILE_DIR, EXP_PASS); + TEST_CHAIN("directory-raw", abs_srcdir "/virstoragetestdata/images/", VIR_STORAGE_FILE_RAW, EXP_PASS); + TEST_CHAIN("directory-none", abs_srcdir "/virstoragetestdata/images/", VIR_STORAGE_FILE_NONE, EXP_PASS); + TEST_CHAIN("directory-dir", abs_srcdir "/virstoragetestdata/images/", VIR_STORAGE_FILE_DIR, EXP_PASS); #ifdef WITH_SYMLINK /* Rewrite qcow2 and wrap file to use backing names relative to a diff --git a/tests/virstoragetestdata/out/directory-dir b/tests/virstoragetestdata/out/directory-dir index cff67595b4..65b7b91912 100644 --- a/tests/virstoragetestdata/out/directory-dir +++ b/tests/virstoragetestdata/out/directory-dir @@ -1,4 +1,4 @@ -path:ABS_BUILDDIR/virstoragedata/dir +path:ABS_SRCDIR/virstoragetestdata/images/ backingStoreRaw: <null> capacity: 0 encryption: 0 diff --git a/tests/virstoragetestdata/out/directory-none b/tests/virstoragetestdata/out/directory-none index cff67595b4..65b7b91912 100644 --- a/tests/virstoragetestdata/out/directory-none +++ b/tests/virstoragetestdata/out/directory-none @@ -1,4 +1,4 @@ -path:ABS_BUILDDIR/virstoragedata/dir +path:ABS_SRCDIR/virstoragetestdata/images/ backingStoreRaw: <null> capacity: 0 encryption: 0 diff --git a/tests/virstoragetestdata/out/directory-raw b/tests/virstoragetestdata/out/directory-raw index ebe23cbbd6..5def2c4b8b 100644 --- a/tests/virstoragetestdata/out/directory-raw +++ b/tests/virstoragetestdata/out/directory-raw @@ -1,4 +1,4 @@ -path:ABS_BUILDDIR/virstoragedata/dir +path:ABS_SRCDIR/virstoragetestdata/images/ backingStoreRaw: <null> capacity: 0 encryption: 0 -- 2.31.1

This one doesn't require using qemu-img either. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- tests/virstoragetest.c | 13 +++---------- .../images/qcow2_nbd-raw.qcow2 | Bin 0 -> 196616 bytes .../virstoragetestdata/out/qcow2-qcow2_nbd-raw | 2 +- 3 files changed, 4 insertions(+), 11 deletions(-) create mode 100644 tests/virstoragetestdata/images/qcow2_nbd-raw.qcow2 diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c index 96aeaef9ce..8d3dde265f 100644 --- a/tests/virstoragetest.c +++ b/tests/virstoragetest.c @@ -536,17 +536,10 @@ mymain(void) /* Qcow2 file with missing backing file but specified type */ TEST_CHAIN("qcow2-qcow2_missing", absqcow2, VIR_STORAGE_FILE_QCOW2, EXP_FAIL); - - /* Rewrite qcow2 to use an nbd: protocol as backend */ - virCommandFree(cmd); - cmd = virCommandNewArgList(qemuimg, "rebase", "-u", "-f", "qcow2", - "-F", "raw", "-b", "nbd+tcp://example.org:6000/blah", - "qcow2", NULL); - if (virCommandRun(cmd, NULL) < 0) - ret = -1; - /* Qcow2 file with backing protocol instead of file */ - TEST_CHAIN("qcow2-qcow2_nbd-raw", absqcow2, VIR_STORAGE_FILE_QCOW2, EXP_PASS); + TEST_CHAIN("qcow2-qcow2_nbd-raw", + abs_srcdir "/virstoragetestdata/images/qcow2_nbd-raw.qcow2", + VIR_STORAGE_FILE_QCOW2, EXP_PASS); /* qed file */ TEST_CHAIN("qed-qed_raw", diff --git a/tests/virstoragetestdata/images/qcow2_nbd-raw.qcow2 b/tests/virstoragetestdata/images/qcow2_nbd-raw.qcow2 new file mode 100644 index 0000000000000000000000000000000000000000..848da7ac9da8e115c7e2fbd334a25c1d7e6bfa28 GIT binary patch literal 196616 zcmeIuJ&x2c6aZi+!vVMfsX<~!6cl>^BqSOt>deH;M#?0SCo6WSI3LI06i769{<NYX zu<ht`<UGfIevZG7@816kAuMvwt$dzeFLFP`+@7662*q)5&N_dc<}Mk3kB1`TW%<Yc z<@Y>Zr25No>TdD#Q!f84gr-f?zFN1_C3QX)n<1t9ar)mKWqg=o>g%p*>Zz`7+b+%? zu-FXSF~!}k9r|k8kMr4?>QKLLVpDy1Q^kHtZQRWqP=v1jy022a-3<5rG?#j;Qid$E zt;c^Rp3f|cEL{C@=b68GT<X`&t7$XdESK@2-i}>-J*3Y!Z&$0;a^2N;kBLSE2oNAZ zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7 z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+ z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly zK!5-N0t5&UAV7cs0RjXFT&F;Jo!4?J0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7 z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBm#f<O^Y z&l9#tB|v}x0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+ z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs j0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5;&>lOG7e&9Zo literal 0 HcmV?d00001 diff --git a/tests/virstoragetestdata/out/qcow2-qcow2_nbd-raw b/tests/virstoragetestdata/out/qcow2-qcow2_nbd-raw index 64acdb880a..08a93b9f32 100644 --- a/tests/virstoragetestdata/out/qcow2-qcow2_nbd-raw +++ b/tests/virstoragetestdata/out/qcow2-qcow2_nbd-raw @@ -1,4 +1,4 @@ -path:ABS_BUILDDIR/virstoragedata/qcow2 +path:ABS_SRCDIR/virstoragetestdata/images/qcow2_nbd-raw.qcow2 backingStoreRaw: nbd+tcp://example.org:6000/blah capacity: 1024 encryption: 0 -- 2.31.1

We've already added a 'raw' file to the example image directory so we can use that instead of formatting one. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- tests/virstoragetest.c | 8 ++++++-- tests/virstoragetestdata/out/raw-auto | 2 +- tests/virstoragetestdata/out/raw-raw | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c index 34aff3e6dd..dcb5a8a427 100644 --- a/tests/virstoragetest.c +++ b/tests/virstoragetest.c @@ -504,8 +504,12 @@ mymain(void) TEST_CHAIN("missing", "bogus", VIR_STORAGE_FILE_RAW, EXP_FAIL); /* Raw image, whether with right format or no specified format */ - TEST_CHAIN("raw-raw", absraw, VIR_STORAGE_FILE_RAW, EXP_PASS); - TEST_CHAIN("raw-auto", absraw, VIR_STORAGE_FILE_AUTO, EXP_PASS); + TEST_CHAIN("raw-raw", + abs_srcdir "/virstoragetestdata/images/raw", + VIR_STORAGE_FILE_RAW, EXP_PASS); + TEST_CHAIN("raw-auto", + abs_srcdir "/virstoragetestdata/images/raw", + VIR_STORAGE_FILE_AUTO, EXP_PASS); /* Qcow2 file with relative raw backing, format provided */ TEST_CHAIN("qcow2-qcow2_raw-raw-relative", absqcow2, VIR_STORAGE_FILE_QCOW2, EXP_PASS); diff --git a/tests/virstoragetestdata/out/raw-auto b/tests/virstoragetestdata/out/raw-auto index 8d6c525896..d98b6e8bf5 100644 --- a/tests/virstoragetestdata/out/raw-auto +++ b/tests/virstoragetestdata/out/raw-auto @@ -1,4 +1,4 @@ -path:ABS_BUILDDIR/virstoragedata/raw +path:ABS_SRCDIR/virstoragetestdata/images/raw backingStoreRaw: <null> capacity: 0 encryption: 0 diff --git a/tests/virstoragetestdata/out/raw-raw b/tests/virstoragetestdata/out/raw-raw index 8d6c525896..d98b6e8bf5 100644 --- a/tests/virstoragetestdata/out/raw-raw +++ b/tests/virstoragetestdata/out/raw-raw @@ -1,4 +1,4 @@ -path:ABS_BUILDDIR/virstoragedata/raw +path:ABS_SRCDIR/virstoragetestdata/images/raw backingStoreRaw: <null> capacity: 0 encryption: 0 -- 2.31.1

More preparation for eliminating image rewriting. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- tests/virstoragetest.c | 8 ++++++-- .../images/qcow2_raw-raw-relative.qcow2 | Bin 0 -> 196616 bytes .../out/qcow2-auto_raw-raw-relative | 2 +- .../out/qcow2-qcow2_raw-raw-relative | 4 ++-- 4 files changed, 9 insertions(+), 5 deletions(-) create mode 100644 tests/virstoragetestdata/images/qcow2_raw-raw-relative.qcow2 diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c index 15296cc14f..9af8795492 100644 --- a/tests/virstoragetest.c +++ b/tests/virstoragetest.c @@ -498,8 +498,12 @@ mymain(void) VIR_STORAGE_FILE_AUTO, EXP_PASS); /* Qcow2 file with relative raw backing, format provided */ - TEST_CHAIN("qcow2-qcow2_raw-raw-relative", absqcow2, VIR_STORAGE_FILE_QCOW2, EXP_PASS); - TEST_CHAIN("qcow2-auto_raw-raw-relative", absqcow2, VIR_STORAGE_FILE_AUTO, EXP_PASS); + TEST_CHAIN("qcow2-qcow2_raw-raw-relative", + abs_srcdir "/virstoragetestdata/images/qcow2_raw-raw-relative.qcow2", + VIR_STORAGE_FILE_QCOW2, EXP_PASS); + TEST_CHAIN("qcow2-auto_raw-raw-relative", + abs_srcdir "/virstoragetestdata/images/qcow2_raw-raw-relative.qcow2", + VIR_STORAGE_FILE_AUTO, EXP_PASS); /* Rewrite qcow2 file to use absolute backing name */ virCommandFree(cmd); diff --git a/tests/virstoragetestdata/images/qcow2_raw-raw-relative.qcow2 b/tests/virstoragetestdata/images/qcow2_raw-raw-relative.qcow2 new file mode 100644 index 0000000000000000000000000000000000000000..492d9bca1902564ba0128fee27122f5beb0e9e32 GIT binary patch literal 196616 zcmeIuyAi@L3;<B&GeG8G5bh}109K&Mv0}zx4H{&W1{R2mC!cJ~E~I<c^W_~8V`ht6 z=9IZ)X3TX&4Bt!pX;D?}^%Ae=Y0K;MxUc(59sl*ur-A?h0t5&UAV7cs0RjXF5FkK+ z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ zfB*pk1o{#f`x?hI1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNA}fWQ#74rr|<0RjXF5FkK+ z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ WfB*pk1PBlyK!5-N0t5*3C-4E}a0f>K literal 0 HcmV?d00001 diff --git a/tests/virstoragetestdata/out/qcow2-auto_raw-raw-relative b/tests/virstoragetestdata/out/qcow2-auto_raw-raw-relative index 4a01b24589..f9afc138f0 100644 --- a/tests/virstoragetestdata/out/qcow2-auto_raw-raw-relative +++ b/tests/virstoragetestdata/out/qcow2-auto_raw-raw-relative @@ -1,4 +1,4 @@ -path:ABS_BUILDDIR/virstoragedata/qcow2 +path:ABS_SRCDIR/virstoragetestdata/images/qcow2_raw-raw-relative.qcow2 backingStoreRaw: <null> capacity: 0 encryption: 0 diff --git a/tests/virstoragetestdata/out/qcow2-qcow2_raw-raw-relative b/tests/virstoragetestdata/out/qcow2-qcow2_raw-raw-relative index a1fb142e98..6e3f7ab339 100644 --- a/tests/virstoragetestdata/out/qcow2-qcow2_raw-raw-relative +++ b/tests/virstoragetestdata/out/qcow2-qcow2_raw-raw-relative @@ -1,4 +1,4 @@ -path:ABS_BUILDDIR/virstoragedata/qcow2 +path:ABS_SRCDIR/virstoragetestdata/images/qcow2_raw-raw-relative.qcow2 backingStoreRaw: raw capacity: 1024 encryption: 0 @@ -8,7 +8,7 @@ format:14 protocol:none hostname:<null> -path:ABS_BUILDDIR/virstoragedata/raw +path:ABS_SRCDIR/virstoragetestdata/images/raw backingStoreRaw: <null> capacity: 0 encryption: 0 -- 2.31.1

For testing of real images formatted by 'qemu-img' it's now sufficient to format them once without the need to rewrtie them since we use the real images only for testing of one scenario. This allows us to also remove moust of the global variables holding the path to the images which was necessary when they were being rewritten. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- tests/virstoragetest.c | 33 ++++----------------------------- 1 file changed, 4 insertions(+), 29 deletions(-) diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c index 475ff23ce0..1ee7bb5230 100644 --- a/tests/virstoragetest.c +++ b/tests/virstoragetest.c @@ -37,28 +37,11 @@ VIR_LOG_INIT("tests.storagetest"); #define datadir abs_builddir "/virstoragedata" -/* This test creates the following files, all in datadir: - - * raw: 1024-byte raw file - * qcow2: qcow2 file with 'raw' as backing - * wrap: qcow2 file with 'qcow2' as backing - * - * Relative names to these files are known at compile time, but absolute - * names depend on where the test is run; for convenience, - * we pre-populate the computation of these names for use during the test. -*/ - -static char *qemuimg; -static char *absraw; -static char *absqcow2; static char *abswrap; static void testCleanupImages(void) { - VIR_FREE(qemuimg); - VIR_FREE(absraw); - VIR_FREE(absqcow2); VIR_FREE(abswrap); if (chdir(abs_builddir) < 0) { @@ -106,8 +89,10 @@ testPrepImages(void) bool compat = false; g_autoptr(virCommand) cmd = NULL; g_autofree char *buf = NULL; + g_autofree char *absraw = g_strdup_printf("%s/raw", datadir); + g_autofree char *absqcow2 = g_strdup_printf("%s/qcow2", datadir); + g_autofree char *qemuimg = virFindFileInPath("qemu-img"); - qemuimg = virFindFileInPath("qemu-img"); if (!qemuimg) goto skip; @@ -126,8 +111,6 @@ testPrepImages(void) compat = true; VIR_FREE(buf); - absraw = g_strdup_printf("%s/raw", datadir); - absqcow2 = g_strdup_printf("%s/qcow2", datadir); abswrap = g_strdup_printf("%s/wrap", datadir); if (g_mkdir_with_parents(datadir, 0777) < 0) { @@ -158,7 +141,7 @@ testPrepImages(void) /* Make sure our later uses of 'qemu-img rebase' will work */ virCommandFree(cmd); cmd = virCommandNewArgList(qemuimg, "rebase", "-u", "-f", "qcow2", - "-F", "raw", "-b", "raw", "qcow2", NULL); + "-F", "raw", "-b", absraw, "qcow2", NULL); if (virCommandRun(cmd, NULL) < 0) goto skip; @@ -469,7 +452,6 @@ mymain(void) virStorageSource *chain = &fakeChain[0]; virStorageSource *chain2 = &fakeChain[1]; virStorageSource *chain3 = &fakeChain[2]; - g_autoptr(virCommand) cmd = NULL; if (storageRegisterAll() < 0) return EXIT_FAILURE; @@ -505,13 +487,6 @@ mymain(void) abs_srcdir "/virstoragetestdata/images/qcow2_raw-raw-relative.qcow2", VIR_STORAGE_FILE_AUTO, EXP_PASS); - /* Rewrite qcow2 file to use absolute backing name */ - virCommandFree(cmd); - cmd = virCommandNewArgList(qemuimg, "rebase", "-u", "-f", "qcow2", - "-F", "raw", "-b", absraw, "qcow2", NULL); - if (virCommandRun(cmd, NULL) < 0) - ret = -1; - /* qcow2 chain with absolute backing formatted with a real qemu-img */ TEST_CHAIN("qcow2-qcow2_qcow2-qcow2_raw-raw", abswrap, VIR_STORAGE_FILE_QCOW2, EXP_PASS); TEST_CHAIN("qcow2-auto_qcow2-qcow2_raw-raw", abswrap, VIR_STORAGE_FILE_AUTO, EXP_PASS); -- 2.31.1

Create it with the appropriate backing file path rather than using another instance of 'qemu-img rebase'. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- tests/virstoragetest.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c index 1ee7bb5230..9a7905e28d 100644 --- a/tests/virstoragetest.c +++ b/tests/virstoragetest.c @@ -132,18 +132,15 @@ testPrepImages(void) /* Create a qcow2 wrapping relative raw; later on, we modify its * metadata to test other configurations */ virCommandFree(cmd); - cmd = virCommandNewArgList(qemuimg, "create", "-f", "qcow2", NULL); - virCommandAddArgFormat(cmd, "-obacking_file=raw,backing_fmt=raw%s", - compat ? ",compat=0.10" : ""); + cmd = virCommandNewArgList(qemuimg, "create", + "-f", "qcow2", + "-F", "raw", + "-b", absraw, NULL); + if (compat) + virCommandAddArgList(cmd, "-o", "compat=0.10", NULL); virCommandAddArg(cmd, "qcow2"); if (virCommandRun(cmd, NULL) < 0) goto skip; - /* Make sure our later uses of 'qemu-img rebase' will work */ - virCommandFree(cmd); - cmd = virCommandNewArgList(qemuimg, "rebase", "-u", "-f", "qcow2", - "-F", "raw", "-b", absraw, "qcow2", NULL); - if (virCommandRun(cmd, NULL) < 0) - goto skip; /* Create a second qcow2 wrapping the first, to be sure that we * can correctly avoid insecure probing. */ -- 2.31.1

Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- tests/virstoragetest.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c index 955ac64e0b..90dde512cf 100644 --- a/tests/virstoragetest.c +++ b/tests/virstoragetest.c @@ -86,7 +86,8 @@ static int testPrepImages(void) { int ret = EXIT_FAILURE; - g_autoptr(virCommand) cmd = NULL; + g_autoptr(virCommand) cmdqcow2 = NULL; + g_autoptr(virCommand) cmdwrap = NULL; g_autofree char *buf = NULL; g_autofree char *absraw = g_strdup_printf("%s/raw", datadir); g_autofree char *absqcow2 = g_strdup_printf("%s/qcow2", datadir); @@ -118,25 +119,24 @@ testPrepImages(void) /* Create a qcow2 wrapping relative raw; later on, we modify its * metadata to test other configurations */ - cmd = virCommandNewArgList(qemuimg, "create", - "-f", "qcow2", - "-F", "raw", - "-b", absraw, - "-o", "compat=0.10", - absqcow2, NULL); - if (virCommandRun(cmd, NULL) < 0) + cmdqcow2 = virCommandNewArgList(qemuimg, "create", + "-f", "qcow2", + "-F", "raw", + "-b", absraw, + "-o", "compat=0.10", + absqcow2, NULL); + if (virCommandRun(cmdqcow2, NULL) < 0) goto skip; /* Create a second qcow2 wrapping the first, to be sure that we * can correctly avoid insecure probing. */ - virCommandFree(cmd); - cmd = virCommandNewArgList(qemuimg, "create", - "-f", "qcow2", - "-F", "qcow2", - "-b", absqcow2, - "-o", "compat=1.1", - abswrap, NULL); - if (virCommandRun(cmd, NULL) < 0) + cmdwrap = virCommandNewArgList(qemuimg, "create", + "-f", "qcow2", + "-F", "qcow2", + "-b", absqcow2, + "-o", "compat=1.1", + abswrap, NULL); + if (virCommandRun(cmdwrap, NULL) < 0) goto skip; ret = 0; -- 2.31.1

Prepare the test runner for skipping individual tests if images can't be formatted rather than the whole virstoragetest. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- tests/virstoragetest.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c index c258bc1709..d9ab630600 100644 --- a/tests/virstoragetest.c +++ b/tests/virstoragetest.c @@ -176,6 +176,11 @@ testStorageChain(const void *args) g_autofree char *expectpath = g_strdup_printf("%s/virstoragetestdata/out/%s", abs_srcdir, data->testname); + /* If the filename is NULL it means that the images couldn't be created, + * thus skip this particular test. */ + if (!data->start) + return EXIT_AM_SKIP; + meta = testStorageFileGetMetadata(data->start, data->format, -1, -1); if (!meta) { if (data->flags & EXP_FAIL) { -- 2.31.1

Improve the error message and abort the test. Continuing here is not desired as without chdiring into the appropriate directory the test would fail anyways and worse could attempt stat-ing random files on the host. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- tests/virstoragetest.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c index bbeb5ecd88..513ffdeb41 100644 --- a/tests/virstoragetest.c +++ b/tests/virstoragetest.c @@ -502,8 +502,9 @@ mymain(void) /* setup data for backing chain lookup testing */ if (chdir(abs_srcdir "/virstoragetestdata/lookup") < 0) { - fprintf(stderr, "unable to test relative backing chains\n"); - goto cleanup; + VIR_TEST_VERBOSE("failed to chdir into '%s'\n", + abs_srcdir "/virstoragetestdata/lookup"); + return EXIT_FAILURE; } memset(fakeChain, 0, sizeof(fakeChain)); @@ -1171,7 +1172,6 @@ mymain(void) #endif /* WITH_YAJL */ - cleanup: return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -- 2.31.1