46fbd3088c
Fix some problems for testsuit building * Patches added: Fix-the-module-building-problem-for-s390.patch tests-qemu-iotests-040-Skip-TestCommitWi.patch tests-qemu-iotests-testrunner-Quote-case.patch OBS-URL: https://build.opensuse.org/request/show/964640 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=697
44 lines
1.6 KiB
Diff
44 lines
1.6 KiB
Diff
From: Thomas Huth <thuth@redhat.com>
|
|
Date: Wed, 23 Feb 2022 13:43:53 +0100
|
|
Subject: tests/qemu-iotests/testrunner: Quote "case not run" lines in TAP mode
|
|
|
|
Git-commit: db4b2133b8d3012dfd1977dc12d48d6bf46543d6
|
|
|
|
In TAP mode, the stdout is reserved for the TAP protocol, so we
|
|
have to make sure to mark other lines with a comment '#' character
|
|
at the beginning to avoid that the TAP parser at the other end
|
|
gets confused.
|
|
|
|
To test this condition, run "configure" for example with:
|
|
|
|
--block-drv-rw-whitelist=copy-before-write,qcow2,raw,file,host_device,blkdebug,null-co,copy-on-read
|
|
|
|
so that iotest 041 will report that some tests are not run due to
|
|
the missing "quorum" driver. Without this change, "make check-block"
|
|
fails since the meson tap parser gets confused by these messages.
|
|
|
|
Signed-off-by: Thomas Huth <thuth@redhat.com>
|
|
Message-Id: <20220223124353.3273898-1-thuth@redhat.com>
|
|
Signed-off-by: Hanna Reitz <hreitz@redhat.com>
|
|
Signed-off-by: Li Zhang <lizhang@suse.de>
|
|
---
|
|
tests/qemu-iotests/testrunner.py | 5 ++++-
|
|
1 file changed, 4 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/tests/qemu-iotests/testrunner.py b/tests/qemu-iotests/testrunner.py
|
|
index 0e29c2fddddb2e7c611f5ad1f366..a7e2c16e09559054e53da60a1ac9 100644
|
|
--- a/tests/qemu-iotests/testrunner.py
|
|
+++ b/tests/qemu-iotests/testrunner.py
|
|
@@ -305,7 +305,10 @@ class TestRunner(ContextManager['TestRunner']):
|
|
test_field_width=test_field_width)
|
|
|
|
if res.casenotrun:
|
|
- print(res.casenotrun)
|
|
+ if self.tap:
|
|
+ print('#' + res.casenotrun.replace('\n', '\n#'))
|
|
+ else:
|
|
+ print(res.casenotrun)
|
|
|
|
return res
|
|
|