nbd: Split nbd.c

[qemu.git] / tests / qemu-iotests / 083

diff --git a/tests/qemu-iotests/083 b/tests/qemu-iotests/083
index 6a52c96bba2f5e2b4e16f336aec1c1317d6e145c..566da99323c2bd5659cfc4c8cb112d467bed8d8b 100755 (executable)
--- a/tests/qemu-iotests/083
+++ b/tests/qemu-iotests/083
@@ -29,7 +29,6 @@ tmp=/tmp/$$
 status=1       # failure is the default!
 
 # get standard environment, filters and checks
-. ./common.env
 . ./common.rc
 . ./common.filter
 
@@ -45,7 +44,7 @@ choose_tcp_port() {
 
 wait_for_tcp_port() {
        while ! (netstat --tcp --listening --numeric | \
-                grep "$1.*0.0.0.0:\*.*LISTEN") 2>&1 >/dev/null; do
+                grep "$1.*0\\.0\\.0\\.0:\\*.*LISTEN") 2>&1 >/dev/null; do
                sleep 0.1
        done
 }
@@ -56,8 +55,9 @@ filter_nbd() {
        # callbacks sometimes, making them unreliable.
        #
        # Filter out the TCP port number since this changes between runs.
-       sed -e 's#^nbd.c:.*##g' \
-           -e 's#nbd:127.0.0.1:[^:]*:#nbd:127.0.0.1:PORT:#g'
+       sed -e 's#^.*nbd/.*\.c:.*##g' \
+           -e 's#nbd:127\.0\.0\.1:[^:]*:#nbd:127\.0\.0\.1:PORT:#g' \
+            -e 's#\(exportname=foo\|PORT\): Failed to .*$#\1#'
 }
 
 check_disconnect() {
@@ -83,7 +83,7 @@ EOF
        fi
 
        $PYTHON nbd-fault-injector.py $extra_args "127.0.0.1:$port" "$TEST_DIR/nbd-fault-injector.conf" 2>&1 >/dev/null &
-       wait_for_tcp_port "127.0.0.1:$port"
+       wait_for_tcp_port "127\\.0\\.0\\.1:$port"
        $QEMU_IO -c "read 0 512" "$nbd_url" 2>&1 | _filter_qemu_io | filter_nbd
 
        echo