On Tue, Feb 14, 2017 at 10:12 AM, Jeff Cody <jc...@redhat.com> wrote: > On Mon, Nov 07, 2016 at 04:59:45PM -0800, Ashish Mittal wrote: >> These changes use a vxhs test server that is a part of the following >> repository: >> https://github.com/MittalAshish/libqnio.git >> >> Signed-off-by: Ashish Mittal <ashish.mit...@veritas.com> >> --- >> v6 changelog: >> (1) Added iotests for VxHS block device. >> >> tests/qemu-iotests/common | 6 ++++++ >> tests/qemu-iotests/common.config | 13 +++++++++++++ >> tests/qemu-iotests/common.filter | 1 + >> tests/qemu-iotests/common.rc | 19 +++++++++++++++++++ >> 4 files changed, 39 insertions(+) >> > > [...] > >> diff --git a/tests/qemu-iotests/common.filter >> b/tests/qemu-iotests/common.filter >> index 240ed06..a8a4d0e 100644 >> --- a/tests/qemu-iotests/common.filter >> +++ b/tests/qemu-iotests/common.filter >> @@ -123,6 +123,7 @@ _filter_img_info() >> -e "s#$TEST_DIR#TEST_DIR#g" \ >> -e "s#$IMGFMT#IMGFMT#g" \ >> -e 's#nbd://127.0.0.1:10810$#TEST_DIR/t.IMGFMT#g' \ >> + -e 's#json.*vdisk-id.*vxhs"}}#TEST_DIR/t.IMGFMT#' \ >> -e "/encrypted: yes/d" \ >> -e "/cluster_size: [0-9]\\+/d" \ >> -e "/table_size: [0-9]\\+/d" \ >> diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc >> index 3213765..06a3164 100644 >> --- a/tests/qemu-iotests/common.rc >> +++ b/tests/qemu-iotests/common.rc >> @@ -89,6 +89,9 @@ else >> TEST_IMG=$TEST_DIR/t.$IMGFMT >> elif [ "$IMGPROTO" = "archipelago" ]; then >> TEST_IMG="archipelago:at.$IMGFMT" >> + elif [ "$IMGPROTO" = "vxhs" ]; then >> + TEST_IMG_FILE=$TEST_DIR/t.$IMGFMT >> + TEST_IMG="vxhs://127.0.0.1:9999/t.$IMGFMT" >> else >> TEST_IMG=$IMGPROTO:$TEST_DIR/t.$IMGFMT >> fi >> @@ -175,6 +178,12 @@ _make_test_img() >> eval "$QEMU_NBD -v -t -b 127.0.0.1 -p 10810 -f $IMGFMT >> $TEST_IMG_FILE &" >> sleep 1 # FIXME: qemu-nbd needs to be listening before we continue >> fi >> + >> + # Start QNIO server on image directory for vxhs protocol >> + if [ $IMGPROTO = "vxhs" ]; then >> + eval "$QEMU_VXHS -d $TEST_DIR &" > > So I spoke too soon about tests passing, but it is not really your fault :) > > After rebasing to master, there is a new test 174 that now hangs (and hangs > for nbd, as well). This is because the test is piping the results of > _make_test_image to sed to filter it. > > This line should redirect stdout to /dev/null, so that the pipe does not > need to wait until process completion: > > eval "$QEMU_VXHS -d $TEST_DIR > /dev/null &" > >
Will make this change in the next series. Thanks again!
