From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47050) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xwonn-0002T6-Vg for qemu-devel@nongnu.org; Fri, 05 Dec 2014 04:03:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xwonf-0004NI-Ir for qemu-devel@nongnu.org; Fri, 05 Dec 2014 04:03:51 -0500 Received: from mx1.redhat.com ([209.132.183.28]:37059) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xwonf-0004M0-A9 for qemu-devel@nongnu.org; Fri, 05 Dec 2014 04:03:43 -0500 Message-ID: <548174E6.9070009@redhat.com> Date: Fri, 05 Dec 2014 10:03:34 +0100 From: Max Reitz MIME-Version: 1.0 References: <1417704542-18337-1-git-send-email-mreitz@redhat.com> <1417704542-18337-4-git-send-email-mreitz@redhat.com> <20141205070818.GE10827@ad.nay.redhat.com> In-Reply-To: <20141205070818.GE10827@ad.nay.redhat.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v2 3/3] iotests: Fix test 039 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Fam Zheng Cc: Kevin Wolf , =?windows-1252?Q?Michael_M=FCll?= =?windows-1252?Q?er?= , qemu-devel@nongnu.org, Stefan Hajnoczi , Markus Armbruster On 2014-12-05 at 08:08, Fam Zheng wrote: > On Thu, 12/04 15:49, Max Reitz wrote: >> Test 039 used qemu-io -c abort for simulating a qemu crash; however, >> abort() generally results in a core dump and ulimit -c 0 is no reliable >> way of preventing that. Use "abort -S 9" instead to have it crash >> without a core dump. > This needs to be fixed to "sigraise 9". Ah, right. Sorry. Will fix (after having waited for Markus's opinion on this v2). > Otherwise looks good. With the commit > message fixed, > > Reviewed-by: Fam Zheng Thanks! Max >> Signed-off-by: Max Reitz >> --- >> tests/qemu-iotests/039 | 12 +++++++----- >> tests/qemu-iotests/039.out | 6 +++--- >> 2 files changed, 10 insertions(+), 8 deletions(-) >> >> diff --git a/tests/qemu-iotests/039 b/tests/qemu-iotests/039 >> index 84c9167..51cb8f7 100755 >> --- a/tests/qemu-iotests/039 >> +++ b/tests/qemu-iotests/039 >> @@ -47,9 +47,11 @@ _supported_os Linux >> _default_cache_mode "writethrough" >> _supported_cache_modes "writethrough" >> >> -_no_dump_exec() >> +_subshell_exec() >> { >> - (ulimit -c 0; exec "$@") >> + # Executing crashing commands in a subshell prevents information like the >> + # "Killed" line from being lost >> + (exec "$@") >> } >> >> size=128M >> @@ -72,7 +74,7 @@ echo "== Creating a dirty image file ==" >> IMGOPTS="compat=1.1,lazy_refcounts=on" >> _make_test_img $size >> >> -_no_dump_exec $QEMU_IO -c "write -P 0x5a 0 512" -c "abort" "$TEST_IMG" 2>&1 | _filter_qemu_io >> +_subshell_exec $QEMU_IO -c "write -P 0x5a 0 512" -c "sigraise 9" "$TEST_IMG" 2>&1 | _filter_qemu_io >> >> # The dirty bit must be set >> $PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features >> @@ -105,7 +107,7 @@ echo "== Opening a dirty image read/write should repair it ==" >> IMGOPTS="compat=1.1,lazy_refcounts=on" >> _make_test_img $size >> >> -_no_dump_exec $QEMU_IO -c "write -P 0x5a 0 512" -c "abort" "$TEST_IMG" 2>&1 | _filter_qemu_io >> +_subshell_exec $QEMU_IO -c "write -P 0x5a 0 512" -c "sigraise 9" "$TEST_IMG" 2>&1 | _filter_qemu_io >> >> # The dirty bit must be set >> $PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features >> @@ -121,7 +123,7 @@ echo "== Creating an image file with lazy_refcounts=off ==" >> IMGOPTS="compat=1.1,lazy_refcounts=off" >> _make_test_img $size >> >> -_no_dump_exec $QEMU_IO -c "write -P 0x5a 0 512" -c "abort" "$TEST_IMG" 2>&1 | _filter_qemu_io >> +_subshell_exec $QEMU_IO -c "write -P 0x5a 0 512" -c "sigraise 9" "$TEST_IMG" 2>&1 | _filter_qemu_io >> >> # The dirty bit must not be set since lazy_refcounts=off >> $PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features >> diff --git a/tests/qemu-iotests/039.out b/tests/qemu-iotests/039.out >> index 0adf153..35a04bd 100644 >> --- a/tests/qemu-iotests/039.out >> +++ b/tests/qemu-iotests/039.out >> @@ -11,7 +11,7 @@ No errors were found on the image. >> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 >> wrote 512/512 bytes at offset 0 >> 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) >> -./039: Aborted ( ulimit -c 0; exec "$@" ) >> +./039: Killed ( exec "$@" ) >> incompatible_features 0x1 >> ERROR cluster 5 refcount=0 reference=1 >> ERROR OFLAG_COPIED data cluster: l2_entry=8000000000050000 refcount=0 >> @@ -46,7 +46,7 @@ read 512/512 bytes at offset 0 >> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 >> wrote 512/512 bytes at offset 0 >> 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) >> -./039: Aborted ( ulimit -c 0; exec "$@" ) >> +./039: Killed ( exec "$@" ) >> incompatible_features 0x1 >> ERROR cluster 5 refcount=0 reference=1 >> Rebuilding refcount structure >> @@ -60,7 +60,7 @@ incompatible_features 0x0 >> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 >> wrote 512/512 bytes at offset 0 >> 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) >> -./039: Aborted ( ulimit -c 0; exec "$@" ) >> +./039: Killed ( exec "$@" ) >> incompatible_features 0x0 >> No errors were found on the image. >> >> -- >> 1.9.3 >> >>