summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorChristoph Hellwig2010-10-31 21:07:46 +0100
committerKevin Wolf2012-02-23 10:29:38 +0100
commit2684871af50cd8efbe753abe333f0acca6d9ab98 (patch)
tree83986664e3fd1e30cad520d89cbd986039658060 /tests
parentqemu-iotests: fix 019 golden output (diff)
downloadqemu-2684871af50cd8efbe753abe333f0acca6d9ab98.tar.gz
qemu-2684871af50cd8efbe753abe333f0acca6d9ab98.tar.xz
qemu-2684871af50cd8efbe753abe333f0acca6d9ab98.zip
qemu-iotests: filter TEST_DIR correctly in 019
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'tests')
-rwxr-xr-xtests/qemu-iotests/0192
-rw-r--r--tests/qemu-iotests/019.out4
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/qemu-iotests/019 b/tests/qemu-iotests/019
index 896b8d9930..e0187b1ffa 100755
--- a/tests/qemu-iotests/019
+++ b/tests/qemu-iotests/019
@@ -92,7 +92,7 @@ mv $TEST_IMG $TEST_IMG.orig
for backing_option in "-B $TEST_IMG.base" "-o backing_file=$TEST_IMG.base"; do
echo
- echo Testing conversion with $backing_option
+ echo Testing conversion with $backing_option | _filter_testdir
echo
$QEMU_IMG convert -O $IMGFMT $backing_option $TEST_IMG.orig $TEST_IMG
diff --git a/tests/qemu-iotests/019.out b/tests/qemu-iotests/019.out
index 84c38a07d5..d3913dfea1 100644
--- a/tests/qemu-iotests/019.out
+++ b/tests/qemu-iotests/019.out
@@ -538,7 +538,7 @@ qemu-io> wrote 65536/65536 bytes at offset 4296146944
64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
qemu-io> No errors were found on the image.
-Testing conversion with -B /home/kwolf/source/iotests-qemu/scratch/t.qcow2.base
+Testing conversion with -B TEST_DIR/t.qcow2.base
Checking if backing clusters are allocated when they shouldn't
@@ -1082,7 +1082,7 @@ qemu-io> read 65536/65536 bytes at offset 4296343552
64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
qemu-io> No errors were found on the image.
-Testing conversion with -o backing_file=/home/kwolf/source/iotests-qemu/scratch/t.qcow2.base
+Testing conversion with -o backing_file=TEST_DIR/t.qcow2.base
Checking if backing clusters are allocated when they shouldn't