| Message ID | 20190319142049.6140-1-ldoktor@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v2] qemu-iotests: Treat custom TEST_DIR in 051 | expand |
Am 19.03.2019 um 15:20 hat Lukáš Doktor geschrieben: > When custom TEST_DIR is specified the output includes it without leading > '/': > > $ TEST_DIR=/var/tmp ./check -file -qcow2 051 > .... > -drive0 (NODE_NAME): json:{"backing": {"driver": "qcow2", "file": > {"driver": "file", "filename": "TEST_DIR/t.qcow2"}}, "driver": "qcow2", > "file": {"driver": "file", "filename": SNAPSHOT_PATH}} (qcow2, > read-only) > +drive0 (NODE_NAME): json:{"backing": {"driver": "qcow2", "file": > {"driver": "file", "filename": "TEST_DIR/t.qcow2"}}, "driver": "qcow2", > "file": {"driver": "file", "filename": "TEST_DIR/vl.ziHfeP"}} (qcow2, > read-only) > > Let's remove it from the sed regexp. Hm, yes, this should probably still be specific enough. > Changes: > > v2: Removed the debugging "tee" commands This note belongs below the "---" so that it doesn't end up in the actual commit message in the repository. > Signed-off-by: Lukáš Doktor <ldoktor@redhat.com> Thanks, fixed the commit message and applied to the block branch. Kevin
diff --git a/tests/qemu-iotests/051 b/tests/qemu-iotests/051 index 6a3b7c2b89..02ac960da4 100755 --- a/tests/qemu-iotests/051 +++ b/tests/qemu-iotests/051 @@ -360,7 +360,7 @@ TMPDIR=/nonexistent run_qemu -drive driver=null-co,snapshot=on echo "info block" | run_qemu -drive file="$TEST_IMG",snapshot=on,read-only=on,if=none,id=$device_id | _filter_qemu_io | - sed -e 's#"/[^"]*/vl\.[A-Za-z0-9]\{6\}"#SNAPSHOT_PATH#g' + sed -e 's#"[^"]*/vl\.[A-Za-z0-9]\{6\}"#SNAPSHOT_PATH#g' # success, all done
When custom TEST_DIR is specified the output includes it without leading '/': $ TEST_DIR=/var/tmp ./check -file -qcow2 051 .... -drive0 (NODE_NAME): json:{"backing": {"driver": "qcow2", "file": {"driver": "file", "filename": "TEST_DIR/t.qcow2"}}, "driver": "qcow2", "file": {"driver": "file", "filename": SNAPSHOT_PATH}} (qcow2, read-only) +drive0 (NODE_NAME): json:{"backing": {"driver": "qcow2", "file": {"driver": "file", "filename": "TEST_DIR/t.qcow2"}}, "driver": "qcow2", "file": {"driver": "file", "filename": "TEST_DIR/vl.ziHfeP"}} (qcow2, read-only) Let's remove it from the sed regexp. Changes: v2: Removed the debugging "tee" commands Signed-off-by: Lukáš Doktor <ldoktor@redhat.com> --- tests/qemu-iotests/051 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)