[PATCH 12/24] virstoragetest: Use existing file for testing 'raw' image lookup

Peter Krempa pkrempa at redhat.com
Thu Sep 9 08:49:12 UTC 2021


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 at redhat.com>
---
 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 information about the libvir-list mailing list