[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v7 5/5] qemu-iotests: add support for Archipelago pr
From: |
Chrysostomos Nanakos |
Subject: |
[Qemu-devel] [PATCH v7 5/5] qemu-iotests: add support for Archipelago protocol |
Date: |
Wed, 23 Jul 2014 17:07:33 +0300 |
Signed-off-by: Chrysostomos Nanakos <address@hidden>
---
tests/qemu-iotests/common | 6 ++++++
tests/qemu-iotests/common.rc | 9 ++++++++-
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/tests/qemu-iotests/common b/tests/qemu-iotests/common
index e4083f4..70df659 100644
--- a/tests/qemu-iotests/common
+++ b/tests/qemu-iotests/common
@@ -152,6 +152,7 @@ check options
-nbd test nbd
-ssh test ssh
-nfs test nfs
+ -archipelago test archipelago
-xdiff graphical mode diff
-nocache use O_DIRECT on backing file
-misalign misalign memory allocations
@@ -263,6 +264,11 @@ testlist options
xpand=false
;;
+ -archipelago)
+ IMGPROTO=archipelago
+ xpand=false
+ ;;
+
-nocache)
CACHEMODE="none"
CACHEMODE_IS_DEFAULT=false
diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
index e0ea7e3..3fd691e 100644
--- a/tests/qemu-iotests/common.rc
+++ b/tests/qemu-iotests/common.rc
@@ -64,6 +64,8 @@ elif [ "$IMGPROTO" = "ssh" ]; then
elif [ "$IMGPROTO" = "nfs" ]; then
TEST_DIR="nfs://127.0.0.1/$TEST_DIR"
TEST_IMG=$TEST_DIR/t.$IMGFMT
+elif [ "$IMGPROTO" = "archipelago" ]; then
+ TEST_IMG="archipelago:at.$IMGFMT"
else
TEST_IMG=$IMGPROTO:$TEST_DIR/t.$IMGFMT
fi
@@ -163,7 +165,8 @@ _make_test_img()
-e "s# lazy_refcounts=\\(on\\|off\\)##g" \
-e "s# block_size=[0-9]\\+##g" \
-e "s# block_state_zero=\\(on\\|off\\)##g" \
- -e "s# log_size=[0-9]\\+##g"
+ -e "s# log_size=[0-9]\\+##g" \
+ -e "s/archipelago:a/TEST_DIR\//g"
# Start an NBD server on the image file, which is what we'll be talking to
if [ $IMGPROTO = "nbd" ]; then
@@ -206,6 +209,10 @@ _cleanup_test_img()
rbd --no-progress rm "$TEST_DIR/t.$IMGFMT" > /dev/null
;;
+ archipelago)
+ vlmc remove "at.$IMGFMT" > /dev/null
+ ;;
+
sheepdog)
collie vdi delete "$TEST_DIR/t.$IMGFMT"
;;
--
1.7.10.4
- [Qemu-devel] [PATCH v7 0/5] Support Archipelago as a QEMU block backend, Chrysostomos Nanakos, 2014/07/23
- [Qemu-devel] [PATCH v7 1/5] block: Support Archipelago as a QEMU block backend, Chrysostomos Nanakos, 2014/07/23
- [Qemu-devel] [PATCH v7 2/5] block/archipelago: Implement bdrv_parse_filename(), Chrysostomos Nanakos, 2014/07/23
- [Qemu-devel] [PATCH v7 4/5] QMP: Add support for Archipelago, Chrysostomos Nanakos, 2014/07/23
- [Qemu-devel] [PATCH v7 3/5] block/archipelago: Add support for creating images, Chrysostomos Nanakos, 2014/07/23
- [Qemu-devel] [PATCH v7 5/5] qemu-iotests: add support for Archipelago protocol,
Chrysostomos Nanakos <=
- Re: [Qemu-devel] [PATCH v7 0/5] Support Archipelago as a QEMU block backend, Stefan Hajnoczi, 2014/07/30
- [Qemu-devel] [PATCH v8 4/5] QMP: Add support for Archipelago, Chrysostomos Nanakos, 2014/07/30