Commit dc48bfdf authored by Max Reitz's avatar Max Reitz
Browse files

iotests: Filter $SOCK_DIR 



Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Message-id: 20191017133155.5327-5-mreitz@redhat.com
Reviewed-by: default avatarThomas Huth <thuth@redhat.com>
Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
parent 93b78ea5

tests/qemu-iotests/common.filter

+5 −1
Original line number Diff line number Diff line
@@ -43,7 +43,8 @@ _filter_qom_path() 
# replace occurrences of the actual TEST_DIR value with TEST_DIR

_filter_testdir()

{

    $SED -e "s#$TEST_DIR/#TEST_DIR/#g"

    $SED -e "s#$TEST_DIR/#TEST_DIR/#g" \

         -e "s#$SOCK_DIR/#SOCK_DIR/#g"

}



# replace occurrences of the actual IMGFMT value with IMGFMT
@@ -124,6 +125,7 @@ _filter_img_create() 
    $SED -e "s#$REMOTE_TEST_DIR#TEST_DIR#g" \

        -e "s#$IMGPROTO:$TEST_DIR#TEST_DIR#g" \

        -e "s#$TEST_DIR#TEST_DIR#g" \

        -e "s#$SOCK_DIR#SOCK_DIR#g" \

        -e "s#$IMGFMT#IMGFMT#g" \

        -e 's#nbd:127.0.0.1:10810#TEST_DIR/t.IMGFMT#g' \

        -e "s# encryption=off##g" \
@@ -160,6 +162,7 @@ _filter_img_info() 
    $SED -e "s#$REMOTE_TEST_DIR#TEST_DIR#g" \

        -e "s#$IMGPROTO:$TEST_DIR#TEST_DIR#g" \

        -e "s#$TEST_DIR#TEST_DIR#g" \

        -e "s#$SOCK_DIR#SOCK_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#' \
@@ -219,6 +222,7 @@ _filter_nbd() 
    $SED -e '/nbd\/.*\.c:/d' \

        -e 's#127\.0\.0\.1:[0-9]*#127.0.0.1:PORT#g' \

        -e "s#?socket=$TEST_DIR#?socket=TEST_DIR#g" \

        -e "s#?socket=$SOCK_DIR#?socket=SOCK_DIR#g" \

        -e 's#\(foo\|PORT/\?\|.sock\): Failed to .*$#\1#'

}