82 lines
3.2 KiB
Diff
82 lines
3.2 KiB
Diff
|
From a97672d9aa9be91ddb2fee0e592e0e137ecca20f Mon Sep 17 00:00:00 2001
|
||
|
|
Message-Id: <a97672d9aa9be91ddb2fee0e592e0e137ecca20f@dist-git>
|
||
|
|
From: Peter Krempa <pkrempa@redhat.com>
|
||
|
|
Date: Tue, 23 Jun 2020 12:23:54 +0200
|
||
|
|
Subject: [PATCH] qemublocktest: Rename TEST_CHECKPOINT_DELETE_MERGE to
|
||
|
|
TEST_CHECKPOINT_DELETE
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
Also rename the helper struct and function.
|
||
|
|
|
||
|
|
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
|
||
|
|
Reviewed-by: Eric Blake <eblake@redhat.com>
|
||
|
|
(cherry picked from commit 520d139b9c3bbf6cc6453044fa6304e1429b7f11)
|
||
|
|
https://bugzilla.redhat.com/show_bug.cgi?id=1804593
|
||
|
|
Message-Id: <cd907a614df510e759d085739ff0523a1ae7b7cc.1592906423.git.pkrempa@redhat.com>
|
||
|
|
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
||
|
|
---
|
||
|
|
tests/qemublocktest.c | 14 +++++++-------
|
||
|
|
1 file changed, 7 insertions(+), 7 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c
|
||
|
|
index 201e5df6b4..0ec964c2c6 100644
|
||
|
|
--- a/tests/qemublocktest.c
|
||
|
|
+++ b/tests/qemublocktest.c
|
||
|
|
@@ -826,7 +826,7 @@ testQemuBackupIncrementalBitmapCalculate(const void *opaque)
|
||
|
|
|
||
|
|
static const char *checkpointDeletePrefix = "qemublocktestdata/checkpointdelete/";
|
||
|
|
|
||
|
|
-struct testQemuCheckpointDeleteMergeData {
|
||
|
|
+struct testQemuCheckpointDeleteData {
|
||
|
|
const char *name;
|
||
|
|
virStorageSourcePtr chain;
|
||
|
|
const char *deletebitmap;
|
||
|
|
@@ -835,9 +835,9 @@ struct testQemuCheckpointDeleteMergeData {
|
||
|
|
|
||
|
|
|
||
|
|
static int
|
||
|
|
-testQemuCheckpointDeleteMerge(const void *opaque)
|
||
|
|
+testQemuCheckpointDelete(const void *opaque)
|
||
|
|
{
|
||
|
|
- const struct testQemuCheckpointDeleteMergeData *data = opaque;
|
||
|
|
+ const struct testQemuCheckpointDeleteData *data = opaque;
|
||
|
|
g_autofree char *actual = NULL;
|
||
|
|
g_autofree char *expectpath = NULL;
|
||
|
|
g_autoptr(virJSONValue) actions = NULL;
|
||
|
|
@@ -1037,7 +1037,7 @@ mymain(void)
|
||
|
|
struct testJSONtoJSONData jsontojsondata;
|
||
|
|
struct testQemuImageCreateData imagecreatedata;
|
||
|
|
struct testQemuBackupIncrementalBitmapCalculateData backupbitmapcalcdata;
|
||
|
|
- struct testQemuCheckpointDeleteMergeData checkpointdeletedata;
|
||
|
|
+ struct testQemuCheckpointDeleteData checkpointdeletedata;
|
||
|
|
struct testQemuBlockBitmapValidateData blockbitmapvalidatedata;
|
||
|
|
struct testQemuBlockBitmapBlockcopyData blockbitmapblockcopydata;
|
||
|
|
struct testQemuBlockBitmapBlockcommitData blockbitmapblockcommitdata;
|
||
|
|
@@ -1316,18 +1316,18 @@ mymain(void)
|
||
|
|
|
||
|
|
TEST_BACKUP_BITMAP_CALCULATE("empty", bitmapSourceChain, "a", "empty");
|
||
|
|
|
||
|
|
-#define TEST_CHECKPOINT_DELETE_MERGE(testname, delbmp, named) \
|
||
|
|
+#define TEST_CHECKPOINT_DELETE(testname, delbmp, named) \
|
||
|
|
do { \
|
||
|
|
checkpointdeletedata.name = testname; \
|
||
|
|
checkpointdeletedata.chain = bitmapSourceChain; \
|
||
|
|
checkpointdeletedata.deletebitmap = delbmp; \
|
||
|
|
checkpointdeletedata.nodedatafile = named; \
|
||
|
|
if (virTestRun("checkpoint delete " testname, \
|
||
|
|
- testQemuCheckpointDeleteMerge, &checkpointdeletedata) < 0) \
|
||
|
|
+ testQemuCheckpointDelete, &checkpointdeletedata) < 0) \
|
||
|
|
ret = -1; \
|
||
|
|
} while (0)
|
||
|
|
|
||
|
|
- TEST_CHECKPOINT_DELETE_MERGE("empty", "a", "empty");
|
||
|
|
+ TEST_CHECKPOINT_DELETE("empty", "a", "empty");
|
||
|
|
|
||
|
|
#define TEST_BITMAP_VALIDATE(testname, bitmap, rc) \
|
||
|
|
do { \
|
||
|
|
--
|
||
|
|
2.27.0
|
||
|
|
|