From patchwork Mon Nov 10 16:59:44 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Reitz X-Patchwork-Id: 409013 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 6032F140174 for ; Tue, 11 Nov 2014 04:01:05 +1100 (AEDT) Received: from localhost ([::1]:44158 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XnsKt-0002vF-JY for incoming@patchwork.ozlabs.org; Mon, 10 Nov 2014 12:01:03 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45516) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XnsJr-0001fN-Ae for qemu-devel@nongnu.org; Mon, 10 Nov 2014 12:00:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XnsJj-00008T-RS for qemu-devel@nongnu.org; Mon, 10 Nov 2014 11:59:59 -0500 Received: from mx1.redhat.com ([209.132.183.28]:36427) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XnsJj-000080-Jm for qemu-devel@nongnu.org; Mon, 10 Nov 2014 11:59:51 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id sAAGxptW011778 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Mon, 10 Nov 2014 11:59:51 -0500 Received: from localhost (dhcp-192-247.str.redhat.com [10.33.192.247]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id sAAGxncR020561 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=NO); Mon, 10 Nov 2014 11:59:50 -0500 From: Max Reitz To: qemu-devel@nongnu.org Date: Mon, 10 Nov 2014 17:59:44 +0100 Message-Id: <1415638784-32311-3-git-send-email-mreitz@redhat.com> In-Reply-To: <1415638784-32311-1-git-send-email-mreitz@redhat.com> References: <1415638784-32311-1-git-send-email-mreitz@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Kevin Wolf , Fam Zheng , Stefan Hajnoczi , Max Reitz Subject: [Qemu-devel] [PATCH v2 2/2] iotests: Plain blkdebug filename generation X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 Reviewed-by: Eric Blake --- 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