From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50184) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xo7g9-0000pJ-5v for qemu-devel@nongnu.org; Tue, 11 Nov 2014 04:24:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xo7g3-0001nq-0D for qemu-devel@nongnu.org; Tue, 11 Nov 2014 04:24:01 -0500 Received: from mx1.redhat.com ([209.132.183.28]:37626) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xo7g2-0001nX-NV for qemu-devel@nongnu.org; Tue, 11 Nov 2014 04:23:54 -0500 From: Max Reitz Date: Tue, 11 Nov 2014 10:23:45 +0100 Message-Id: <1415697825-26678-3-git-send-email-mreitz@redhat.com> In-Reply-To: <1415697825-26678-1-git-send-email-mreitz@redhat.com> References: <1415697825-26678-1-git-send-email-mreitz@redhat.com> Subject: [Qemu-devel] [PATCH v3 2/2] iotests: Plain blkdebug filename generation List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Peter Lieven , Stefan Hajnoczi , Max Reitz Add one test whether blkdebug is able to generate a plain filename if given a configuration file and a file to be tested only; and add another test whether blkdebug is able to do the same without being given a configuration file. Signed-off-by: Max Reitz --- tests/qemu-iotests/099 | 15 ++++++++++++++- tests/qemu-iotests/099.out | 8 ++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/tests/qemu-iotests/099 b/tests/qemu-iotests/099 index ffc7ea7..132aa0b 100755 --- a/tests/qemu-iotests/099 +++ b/tests/qemu-iotests/099 @@ -107,8 +107,21 @@ echo # generate a JSON object here as well test_qemu "file.driver=blkverify,file.raw.filename=$TEST_IMG.compare,file.test.file.driver=blkdebug,file.test.file.image.filename=$TEST_IMG,file.test.file.inject-error.0.event=l1_update" +echo +echo '=== Testing plain filename for blkdebug ===' +echo + +touch "$TEST_DIR/blkdebug.conf" +test_qemu "file.driver=blkdebug,file.config=$TEST_DIR/blkdebug.conf,file.image.filename=$TEST_IMG" + +echo +echo '=== Testing plain filename for blkdebug without configuration file ===' +echo + +test_qemu "file.driver=blkdebug,file.image.filename=$TEST_IMG" + -rm -f "$TEST_IMG.compare" +rm -f "$TEST_IMG.compare" "$TEST_DIR/blkdebug.conf" # success, all done echo "*** done" diff --git a/tests/qemu-iotests/099.out b/tests/qemu-iotests/099.out index 50cc527..2fa06ff 100644 --- a/tests/qemu-iotests/099.out +++ b/tests/qemu-iotests/099.out @@ -17,4 +17,12 @@ json:{"driver": "IMGFMT", "file": {"image": {"driver": "file", "filename": "TEST === Testing indirectly enforced JSON filename === json:{"driver": "raw", "file": {"test": {"driver": "IMGFMT", "file": {"image": {"driver": "file", "filename": "TEST_DIR/t.IMGFMT"}, "driver": "blkdebug", "inject-error.0.event": "l1_update"}}, "driver": "blkverify", "raw": {"driver": "file", "filename": "TEST_DIR/t.IMGFMT.compare"}}} + +=== Testing plain filename for blkdebug === + +blkdebug:TEST_DIR/blkdebug.conf:TEST_DIR/t.IMGFMT + +=== Testing plain filename for blkdebug without configuration file === + +blkdebug::TEST_DIR/t.IMGFMT *** done -- 1.9.3