mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qemu-iotests: do not include common.rc in "check"

Browse Source 
It only provides functions used by the test programs.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Paolo Bonzini 2017-09-12 16:44:55 +02:00 committed by Kevin Wolf
parent d1f2447a3e
commit 3817ce03bf
2 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/qemu-iotests/check
View File

@ -72,12 +72,6 @@ then
_init_error "failed to source common.config" _init_error "failed to source common.config"
fi fi
# we need common.rc
if ! . "$source_iotests/common.rc"
then
_init_error "failed to source common.rc"
fi
# we need common # we need common
. "$source_iotests/common" . "$source_iotests/common"

13
tests/qemu-iotests/common.rc
View File

@ -40,14 +40,11 @@ poke_file()
printf "$3" | dd "of=$1" bs=1 "seek=$2" conv=notrunc &>/dev/null printf "$3" | dd "of=$1" bs=1 "seek=$2" conv=notrunc &>/dev/null
} }
# we need common.config
if [ "$iam" != "check" ] if ! . ./common.config
then then
if ! . ./common.config echo "$iam: failed to source common.config"
then exit 1
echo "$iam: failed to source common.config"
exit 1
fi
fi fi
_qemu_wrapper() _qemu_wrapper()