| Message ID | 1419006909-1781-1-git-send-email-kwolf@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 19 December 2014 at 16:34, Kevin Wolf <kwolf@redhat.com> wrote: > The following changes since commit dfa9c2a0f4d0a0c8b2c1449ecdbb1297427e1560: > > Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging (2014-12-15 16:43:42 +0000) > > are available in the git repository at: > > > git://repo.or.cz/qemu/kevin.git tags/for-upstream > > for you to fetch changes up to 55873077d9e00c4da12ba1068bd9566fc6c32388: > > iotests: Filter out "I/O thread spun..." warning (2014-12-19 17:17:47 +0100) > > ---------------------------------------------------------------- > Block patches for 2.3 Hi. I'm afraid this fails "make check" on MacOSX: /Users/pm215/src/qemu/tests/qemu-iotests-quick.sh /Users/pm215/src/qemu/tests/qemu-iotests/common.config: line 158: /bin/true: No such file or directory check: failed to source common.config On OSX "true" is /usr/bin/true. common.config should just use "true" here I think, and let the shell figure out where it is (typically a builtin, obviously). thanks -- PMM
On 22 December 2014 at 11:14, Peter Maydell <peter.maydell@linaro.org> wrote: > Hi. I'm afraid this fails "make check" on MacOSX: > /Users/pm215/src/qemu/tests/qemu-iotests-quick.sh > /Users/pm215/src/qemu/tests/qemu-iotests/common.config: line 158: > /bin/true: No such file or directory > check: failed to source common.config > > On OSX "true" is /usr/bin/true. common.config should just use > "true" here I think, and let the shell figure out where it is > (typically a builtin, obviously). common.rc and common.filter also have this bug. With those fixed, 'make check-block' now runs two tests (most are skipped with "not suitable for this OS: Darwin"), of which 058 fails: ===begin=== 058 [12:01:48] [12:01:49] - output mismatch (see 058.out.bad) --- /Users/pm215/src/qemu/tests/qemu-iotests/058.out 2014-02-17 23:38:30.000000000 +0000 +++ 058.out.bad 2014-12-22 12:01:49.000000000 +0000 @@ -1,44 +1,37 @@ QA output created by 058 == preparing image == -Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 -wrote 4096/4096 bytes at offset 4096 -4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -wrote 4096/4096 bytes at offset 8192 -4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -wrote 4096/4096 bytes at offset 4096 -4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -wrote 4096/4096 bytes at offset 8192 -4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 cluster_size=65536 lazy_refcounts=off +wite [-bcCpqz] [-P patten ] off len -- wites a numbe of bytes at a specified offset +wite [-bcCpqz] [-P patten ] off len -- wites a numbe of bytes at a specified offset +wite [-bcCpqz] [-P patten ] off len -- wites a numbe of bytes at a specified offset +wite [-bcCpqz] [-P patten ] off len -- wites a numbe of bytes at a specified offset No errors were found on the image. +Image end offset: 393216 == verifying the image file with patterns == -read 4096/4096 bytes at offset 4096 -4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -read 4096/4096 bytes at offset 8192 -4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +ead [-abCpqv] [-P patten [-s off] [-l len]] off len -- eads a numbe of bytes at a specified offset +ead [-abCpqv] [-P patten [-s off] [-l len]] off len -- eads a numbe of bytes at a specified offset == verifying the exported snapshot with patterns, method 1 == -read 4096/4096 bytes at offset 4096 -4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -read 4096/4096 bytes at offset 8192 -4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +ead [-abCpqv] [-P patten [-s off] [-l len]] off len -- eads a numbe of bytes at a specified offset +ead [-abCpqv] [-P patten [-s off] [-l len]] off len -- eads a numbe of bytes at a specified offset == verifying the exported snapshot with patterns, method 2 == -read 4096/4096 bytes at offset 4096 -4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -read 4096/4096 bytes at offset 8192 -4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +ead [-abCpqv] [-P patten [-s off] [-l len]] off len -- eads a numbe of bytes at a specified offset +ead [-abCpqv] [-P patten [-s off] [-l len]] off len -- eads a numbe of bytes at a specified offset +qemu-img: Could not open '-l': Could not open '-l': No such file or directory == verifying the converted snapshot with patterns, method 1 == -read 4096/4096 bytes at offset 4096 -4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -read 4096/4096 bytes at offset 8192 -4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +qemu-io: can't open device .converted: Could not open '.converted': No such file or directory +no file open, try 'help open' +qemu-io: can't open device .converted: Could not open '.converted': No such file or directory +no file open, try 'help open' +qemu-img: Could not open '-l': Could not open '-l': No such file or directory == verifying the converted snapshot with patterns, method 2 == -read 4096/4096 bytes at offset 4096 -4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -read 4096/4096 bytes at offset 8192 -4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +qemu-io: can't open device .converted: Could not open '.converted': No such file or directory +no file open, try 'help open' +qemu-io: can't open device .converted: Could not open '.converted': No such file or directory +no file open, try 'help open' *** done ===endit=== Something very odd is happening here: why are all the "r"s apparently missing from those error messages? -- PMM
On 22 December 2014 at 12:07, Peter Maydell <peter.maydell@linaro.org> wrote: > Something very odd is happening here: why are all the "r"s apparently > missing from those error messages? Looks like the result of using GNU sed-isms in some of the filters. On OSX: $ echo "art trick" | sed -e 's/\r//g' at tick On Linux with GNU sed: $ echo "art trick" | sed -e 's/\r//g' art trick This likely breaks on the BSDs too. I suspect these scripts need a careful overhaul before we can add them to 'make check' :-( -- PMM
On Mon, 12/22 12:22, Peter Maydell wrote: > On 22 December 2014 at 12:07, Peter Maydell <peter.maydell@linaro.org> wrote: > > Something very odd is happening here: why are all the "r"s apparently > > missing from those error messages? > > Looks like the result of using GNU sed-isms in some of the filters. On OSX: > > $ echo "art trick" | sed -e 's/\r//g' > at tick > > On Linux with GNU sed: > $ echo "art trick" | sed -e 's/\r//g' > art trick > > This likely breaks on the BSDs too. I suspect these scripts need > a careful overhaul before we can add them to 'make check' :-( > Oops! Thanks Peter, I'll take care of it and respin. We should drop these patches from this PULL for now. Fam
On Fri, Dec 19, 2014 at 4:34 PM, Kevin Wolf <kwolf@redhat.com> wrote: > The following changes since commit dfa9c2a0f4d0a0c8b2c1449ecdbb1297427e1560: > > Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging (2014-12-15 16:43:42 +0000) > > are available in the git repository at: > > > git://repo.or.cz/qemu/kevin.git tags/for-upstream > > for you to fetch changes up to 55873077d9e00c4da12ba1068bd9566fc6c32388: > > iotests: Filter out "I/O thread spun..." warning (2014-12-19 17:17:47 +0100) Taking over from Kevin since he is on vacation. I dropped the patch that adds qemu-iotests to make check for now. Once Fam has resolved the issues we can merge that patch again. I've sent a new pull request. Stefan
The following changes since commit dfa9c2a0f4d0a0c8b2c1449ecdbb1297427e1560: Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging (2014-12-15 16:43:42 +0000) are available in the git repository at: git://repo.or.cz/qemu/kevin.git tags/for-upstream for you to fetch changes up to 55873077d9e00c4da12ba1068bd9566fc6c32388: iotests: Filter out "I/O thread spun..." warning (2014-12-19 17:17:47 +0100) ---------------------------------------------------------------- Block patches for 2.3 ---------------------------------------------------------------- Fam Zheng (8): qemu-iotests: Remove 091 from quick group qemu-iotests: Speed up make check-block tests/Makefile: Add check-block to make check qapi: Fix document for BlockStats.node-name qapi: Comment version info in TransactionAction qmp: Add command 'blockdev-backup' block: Add blockdev-backup to transaction qemu-iotests: Test blockdev-backup in 055 Kevin Wolf (1): Merge remote-tracking branch 'mreitz/block' into queue-block Max Reitz (7): checkpatch: Brace handling on multi-line condition block: Get full backing filename from string block: JSON filenames and relative backing files block: Relative backing file for image creation block/vmdk: Relative backing file for creation iotests: Add test for relative backing file names iotests: Filter out "I/O thread spun..." warning Paolo Bonzini (3): block: mark AioContext as recursive block: do not allocate an iovec per read of a growable/zero_after_eof BDS block: replace g_new0 with g_new for bottom half allocation. Vladimir Sementsov-Ogievskiy (1): block: fix spoiling all dirty bitmaps by mirror and migration async.c | 11 +- block-migration.c | 5 +- block.c | 81 ++++++++++++--- block/backup.c | 28 ++++++ block/mirror.c | 11 +- block/qapi.c | 7 +- block/vmdk.c | 13 ++- blockdev.c | 133 ++++++++++++++++++++++++ include/block/block.h | 12 ++- qapi-schema.json | 8 ++ qapi/block-core.json | 56 ++++++++++- qmp-commands.hx | 42 ++++++++ scripts/checkpatch.pl | 13 ++- tests/Makefile | 2 +- tests/qemu-iotests-quick.sh | 2 +- tests/qemu-iotests/055 | 211 ++++++++++++++++++++++++++++++++------- tests/qemu-iotests/055.out | 4 +- tests/qemu-iotests/067 | 3 +- tests/qemu-iotests/071 | 2 +- tests/qemu-iotests/071.out | 8 +- tests/qemu-iotests/081 | 2 +- tests/qemu-iotests/087 | 3 +- tests/qemu-iotests/087.out | 1 - tests/qemu-iotests/099 | 2 +- tests/qemu-iotests/110 | 94 +++++++++++++++++ tests/qemu-iotests/110.out | 19 ++++ tests/qemu-iotests/check | 1 + tests/qemu-iotests/common.filter | 1 + tests/qemu-iotests/group | 3 +- 29 files changed, 692 insertions(+), 86 deletions(-) create mode 100755 tests/qemu-iotests/110 create mode 100644 tests/qemu-iotests/110.out