diff options
| author | Max Reitz <mreitz@redhat.com> | 2014-05-24 23:25:00 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2014-06-27 20:00:01 +0200 |
| commit | f5264553c381c5f305d6e11bef18da6a29f3f423 (patch) | |
| tree | 399cff39fca51cef0783550d1629236777bf1bf3 | |
| parent | f99b4b5d7e53e85552892cdf6c7d2c3c86d409f8 (diff) | |
| download | focaccia-qemu-f5264553c381c5f305d6e11bef18da6a29f3f423.tar.gz focaccia-qemu-f5264553c381c5f305d6e11bef18da6a29f3f423.zip | |
iotests: Fix 083 for out-of-tree builds
iotest 083 filters out debug messages from nbd, which are prefixed (and recognized) by __FILE__. However, the current filter (/^nbd\.c…/) is valid for in-tree builds only, as out-of-tree builds will have a path before that filename (e.g. "/tmp/qemu/nbd.c"). Fix this by adding .* before "nbd\.c". While working on this, also fix the regexes: '.' should be escaped and a single backslash is not enough for escaping when enclosed by double quotes. Signed-off-by: Max Reitz <mreitz@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
| -rwxr-xr-x | tests/qemu-iotests/083 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/qemu-iotests/083 b/tests/qemu-iotests/083 index b7ba8608e4..991a9d91db 100755 --- a/tests/qemu-iotests/083 +++ b/tests/qemu-iotests/083 @@ -44,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 } @@ -55,8 +55,8 @@ 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' } check_disconnect() { @@ -82,7 +82,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 |