From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41395) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XWsP4-0006fc-9j for qemu-devel@nongnu.org; Wed, 24 Sep 2014 15:39:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XWsOy-0005kz-50 for qemu-devel@nongnu.org; Wed, 24 Sep 2014 15:39:06 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41050) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XWsOx-0005kj-U2 for qemu-devel@nongnu.org; Wed, 24 Sep 2014 15:39:00 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s8OJcsmI001256 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Wed, 24 Sep 2014 15:38:54 -0400 From: Max Reitz Date: Wed, 24 Sep 2014 21:38:41 +0200 Message-Id: <1411587521-3569-4-git-send-email-mreitz@redhat.com> In-Reply-To: <1411587521-3569-1-git-send-email-mreitz@redhat.com> References: <1411587521-3569-1-git-send-email-mreitz@redhat.com> Subject: [Qemu-devel] [PATCH 3/3] 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 , Paolo Bonzini , Stefan Hajnoczi , Max Reitz Add a test whether blkdebug is able to generate a plain filename if given a configuration file and a file to be tested only. Signed-off-by: Max Reitz --- tests/qemu-iotests/099 | 9 ++++++++- tests/qemu-iotests/099.out | 4 ++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/tests/qemu-iotests/099 b/tests/qemu-iotests/099 index ffc7ea7..74aa6d9 100755 --- a/tests/qemu-iotests/099 +++ b/tests/qemu-iotests/099 @@ -107,8 +107,15 @@ 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" + -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..3eebace 100644 --- a/tests/qemu-iotests/099.out +++ b/tests/qemu-iotests/099.out @@ -17,4 +17,8 @@ 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 *** done -- 2.1.0