在 2016-12-16 22:34, Eric Blake 写道:
[adding qemu-devel, ALL patches should include the main list]
On 12/15/2016 11:47 PM, QingFeng Hao wrote:
If TEST_DIR is set to /tmp, test case 144 will fail. The reason is that
TEST_DIR duplicates with 144's test image name tmp.qcow2.
s/duplicates with/resembles/
yes
when 144 is testing $TEST_DIR/tmp.qcow2, it wants to replace
$TEST_DIR/tmp.qcow2 to TEST_DIR/tmp.qcow2, but actually it will fail
and get TEST_DIRTEST_DIR.qcow2 in this case.
The fix is just to modify the code to replace $TEST_DIR/ with TEST_DIR/.
Signed-off-by: QingFeng Hao <ha...@linux.vnet.ibm.com>
---
tests/qemu-iotests/common.filter | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common.filter
index 240ed06..d29e965 100644
--- a/tests/qemu-iotests/common.filter
+++ b/tests/qemu-iotests/common.filter
@@ -35,7 +35,7 @@ _filter_generated_node_ids()
# replace occurrences of the actual TEST_DIR value with TEST_DIR
_filter_testdir()
{
- sed -e "s#$TEST_DIR#TEST_DIR#g"
+ sed -e "s#$TEST_DIR\/#TEST_DIR\/#g"
Why do you need \/? It should be sufficient to use / without escaping.
But overall I agree with including the / in the pattern. It's too late
to include this in 2.8, but with the commit message grammar improved and
\ escape removed, I'm fine with:
Reviewed-by: Eric Blake <ebl...@redhat.com>
Right! We can use / directly in this case. Thanks :-)
I'm also adding qemu-trivial in cc, in case we want to take it through
that tree instead of the usual qemu-iotests.
--
QingFeng Hao(Robin)
