diff options
author | Eric Blake <eblake@redhat.com> | 2018-11-16 15:50:02 -0600 |
---|---|---|
committer | Eric Blake <eblake@redhat.com> | 2018-11-19 11:16:46 -0600 |
commit | 8cedcffdc195bc39aeb1373826ba0a45629741e0 (patch) | |
tree | 46509d211d6dcf12f6d2923e9a37a1667177f762 /tests/qemu-iotests/common.nbd | |
parent | bb39c47d70e84acf5066f79eba27ae5945b837be (diff) | |
download | qemu-8cedcffdc195bc39aeb1373826ba0a45629741e0.zip |
iotests: Drop use of bash keyword 'function'
Bash allows functions to be declared with or without the leading
keyword 'function'; but including the keyword does not comply with
POSIX syntax, and is confusing to ksh users where the use of the
keyword changes the scoping rules for functions. Stick to the
POSIX form through iotests.
Done mechanically with:
sed -i 's/^function //' $(git ls-files tests/qemu-iotests)
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <20181116215002.2124581-1-eblake@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Diffstat (limited to 'tests/qemu-iotests/common.nbd')
-rw-r--r-- | tests/qemu-iotests/common.nbd | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/qemu-iotests/common.nbd b/tests/qemu-iotests/common.nbd index 0f4497a7ea..233187a25c 100644 --- a/tests/qemu-iotests/common.nbd +++ b/tests/qemu-iotests/common.nbd @@ -23,7 +23,7 @@ nbd_unix_socket="${TEST_DIR}/qemu-nbd.sock" nbd_tcp_addr="127.0.0.1" nbd_pid_file="${TEST_DIR}/qemu-nbd.pid" -function nbd_server_stop() +nbd_server_stop() { local NBD_PID if [ -f "$nbd_pid_file" ]; then @@ -36,7 +36,7 @@ function nbd_server_stop() rm -f "$nbd_unix_socket" } -function nbd_server_wait_for_unix_socket() +nbd_server_wait_for_unix_socket() { pid=$1 @@ -57,14 +57,14 @@ function nbd_server_wait_for_unix_socket() exit 1 } -function nbd_server_start_unix_socket() +nbd_server_start_unix_socket() { nbd_server_stop $QEMU_NBD -v -t -k "$nbd_unix_socket" "$@" & nbd_server_wait_for_unix_socket $! } -function nbd_server_set_tcp_port() +nbd_server_set_tcp_port() { (ss --help) >/dev/null 2>&1 || _notrun "ss utility not found, skipping test" @@ -80,7 +80,7 @@ function nbd_server_set_tcp_port() exit 1 } -function nbd_server_wait_for_tcp_socket() +nbd_server_wait_for_tcp_socket() { pid=$1 @@ -101,7 +101,7 @@ function nbd_server_wait_for_tcp_socket() exit 1 } -function nbd_server_start_tcp_socket() +nbd_server_start_tcp_socket() { nbd_server_stop $QEMU_NBD -v -t -b $nbd_tcp_addr -p $nbd_tcp_port "$@" & |