summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCleber Rosa <crosa@redhat.com>2017-07-27 08:02:07 -0400
committerMichael Tokarev <mjt@tls.msk.ru>2017-08-14 13:06:54 +0300
commit657c572afe8dae393f2321db8866c02b4bf7bc77 (patch)
tree6e8176fac1baae2ad76a7230d7f6b11b33043c2b
parent88552b553b0f2d75f0f91a247f19c2e3b81ed5aa (diff)
downloadqemu-657c572afe8dae393f2321db8866c02b4bf7bc77.tar.gz
qemu-iotests: get rid of _full_imgproto_details()
Although this function is used, its implementation does nothing besides echoing a variable name. There's no need to wrap this functionality in a function, and based on the one usage it has, it's not even required to adhere to a convention or code style. Signed-off-by: Cleber Rosa <crosa@redhat.com> Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
-rwxr-xr-xtests/qemu-iotests/check3
-rw-r--r--tests/qemu-iotests/common.rc5
2 files changed, 1 insertions, 7 deletions
diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check
index 2a55ec9ada..7a2e0d0119 100755
--- a/tests/qemu-iotests/check
+++ b/tests/qemu-iotests/check
@@ -228,7 +228,6 @@ rm -f check.full
[ -f $TIMESTAMP_FILE ] || touch $TIMESTAMP_FILE
FULL_IMGFMT_DETAILS=`_full_imgfmt_details`
-FULL_IMGPROTO_DETAILS=`_full_imgproto_details`
FULL_HOST_DETAILS=`_full_platform_details`
#FULL_MKFS_OPTIONS=`_scratch_mkfs_options`
#FULL_MOUNT_OPTIONS=`_scratch_mount_options`
@@ -239,7 +238,7 @@ QEMU_IMG -- "$QEMU_IMG_PROG" $QEMU_IMG_OPTIONS
QEMU_IO -- "$QEMU_IO_PROG" $QEMU_IO_OPTIONS
QEMU_NBD -- "$QEMU_NBD_PROG" $QEMU_NBD_OPTIONS
IMGFMT -- $FULL_IMGFMT_DETAILS
-IMGPROTO -- $FULL_IMGPROTO_DETAILS
+IMGPROTO -- $IMGPROTO
PLATFORM -- $FULL_HOST_DETAILS
TEST_DIR -- $TEST_DIR
SOCKET_SCM_HELPER -- $SOCKET_SCM_HELPER
diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
index bfbc80e5f6..8d486dbeb4 100644
--- a/tests/qemu-iotests/common.rc
+++ b/tests/qemu-iotests/common.rc
@@ -482,11 +482,6 @@ _full_imgfmt_details()
fi
}
-_full_imgproto_details()
-{
- echo "$IMGPROTO"
-}
-
_full_platform_details()
{
os=`uname -s`