diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2017-09-12 16:44:55 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2017-10-06 16:28:58 +0200 |
| commit | 3817ce03bf3373065c25e389ecb7f23a511ebcdc (patch) | |
| tree | c66cd63234a4794be712b45a835920399bcc6a1f | |
| parent | d1f2447a3e8d0804838e2445f955996c925395ef (diff) | |
| download | qemu-3817ce03bf3373065c25e389ecb7f23a511ebcdc.zip qemu-3817ce03bf3373065c25e389ecb7f23a511ebcdc.tar.gz qemu-3817ce03bf3373065c25e389ecb7f23a511ebcdc.tar.bz2 | |
qemu-iotests: do not include common.rc in "check"
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>
| -rwxr-xr-x | tests/qemu-iotests/check | 6 | ||||
| -rw-r--r-- | tests/qemu-iotests/common.rc | 13 |
2 files changed, 5 insertions, 14 deletions
diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check index 03871d0..e39680a 100755 --- a/tests/qemu-iotests/check +++ b/tests/qemu-iotests/check @@ -72,12 +72,6 @@ then _init_error "failed to source common.config" fi -# we need common.rc -if ! . "$source_iotests/common.rc" -then - _init_error "failed to source common.rc" -fi - # we need common . "$source_iotests/common" diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc index e7f74b4..20f6821 100644 --- a/tests/qemu-iotests/common.rc +++ b/tests/qemu-iotests/common.rc @@ -40,14 +40,11 @@ poke_file() printf "$3" | dd "of=$1" bs=1 "seek=$2" conv=notrunc &>/dev/null } -# we need common.config -if [ "$iam" != "check" ] -then - if ! . ./common.config - then - echo "$iam: failed to source common.config" - exit 1 - fi + +if ! . ./common.config + then + echo "$iam: failed to source common.config" + exit 1 fi _qemu_wrapper() |