diff options
| author | Paolo Bonzini | 2017-09-12 16:44:56 +0200 |
|---|---|---|
| committer | Kevin Wolf | 2017-10-06 16:28:58 +0200 |
| commit | cce293a29459e1fd5f74e55d87dc9c25991da578 (patch) | |
| tree | 678b0609f67a54094bea588e7358e0ad4c8e5980 /tests/qemu-iotests/common.config | |
| parent | qemu-iotests: do not include common.rc in "check" (diff) | |
| download | qemu-cce293a29459e1fd5f74e55d87dc9c25991da578.tar.gz qemu-cce293a29459e1fd5f74e55d87dc9c25991da578.tar.xz qemu-cce293a29459e1fd5f74e55d87dc9c25991da578.zip | |
qemu-iotests: disintegrate more parts of common.config
Split "check" parts from tests part.
For the directory setup, the actual computation of directories goes
in "check", while the sanity checks go in the tests.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'tests/qemu-iotests/common.config')
| -rw-r--r-- | tests/qemu-iotests/common.config | 49 |
1 files changed, 0 insertions, 49 deletions
diff --git a/tests/qemu-iotests/common.config b/tests/qemu-iotests/common.config index c7f0a7a7e0..cdcda54546 100644 --- a/tests/qemu-iotests/common.config +++ b/tests/qemu-iotests/common.config @@ -26,8 +26,6 @@ arch=`uname -m` export PWD=`pwd` -export _QEMU_HANDLE=0 - # make sure we have a standard umask umask 022 @@ -40,52 +38,5 @@ _optstr_add() fi } -QEMU_IMG_EXTRA_ARGS= -if [ "$IMGOPTSSYNTAX" = "true" ]; then - QEMU_IMG_EXTRA_ARGS="--image-opts $QEMU_IMG_EXTRA_ARGS" - if [ -n "$IMGKEYSECRET" ]; then - QEMU_IMG_EXTRA_ARGS="--object secret,id=keysec0,data=$IMGKEYSECRET $QEMU_IMG_EXTRA_ARGS" - fi -fi -export QEMU_IMG_EXTRA_ARGS - - -default_machine=$($QEMU_PROG -machine help | sed -n '/(default)/ s/ .*//p') -default_alias_machine=$($QEMU_PROG -machine help | \ - sed -n "/(alias of $default_machine)/ { s/ .*//p; q; }") -if [[ "$default_alias_machine" ]]; then - default_machine="$default_alias_machine" -fi - -export QEMU_DEFAULT_MACHINE="$default_machine" - -if [ -z "$TEST_DIR" ]; then - TEST_DIR=`pwd`/scratch -fi - -QEMU_TEST_DIR="${TEST_DIR}" - -if [ ! -e "$TEST_DIR" ]; then - mkdir "$TEST_DIR" -fi - -if [ ! -d "$TEST_DIR" ]; then - echo "common.config: Error: \$TEST_DIR ($TEST_DIR) is not a directory" - exit 1 -fi - -export TEST_DIR - -if [ -z "$SAMPLE_IMG_DIR" ]; then - SAMPLE_IMG_DIR="$source_iotests/sample_images" -fi - -if [ ! -d "$SAMPLE_IMG_DIR" ]; then - echo "common.config: Error: \$SAMPLE_IMG_DIR ($SAMPLE_IMG_DIR) is not a directory" - exit 1 -fi - -export SAMPLE_IMG_DIR - # make sure this script returns success true |