From patchwork Wed Jan 29 08:50:23 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Lieven X-Patchwork-Id: 314939 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 698222C00B7 for ; Wed, 29 Jan 2014 19:53:01 +1100 (EST) Received: from localhost ([::1]:41022 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W8QtH-0000Hb-9j for incoming@patchwork.ozlabs.org; Wed, 29 Jan 2014 03:52:59 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50295) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W8Qsf-0000EO-Lx for qemu-devel@nongnu.org; Wed, 29 Jan 2014 03:52:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W8QsZ-0000UZ-R8 for qemu-devel@nongnu.org; Wed, 29 Jan 2014 03:52:21 -0500 Received: from mx.ipv6.kamp.de ([2a02:248:0:51::16]:39452 helo=mx01.kamp.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W8QsZ-0000UJ-GV for qemu-devel@nongnu.org; Wed, 29 Jan 2014 03:52:15 -0500 Received: (qmail 1284 invoked by uid 89); 29 Jan 2014 08:52:14 -0000 Received: from [82.141.1.145] by client-16-kamp (envelope-from , uid 89) with qmail-scanner-2010/03/19-MF (clamdscan: 0.98.1/18410. hbedv: 8.2.12.180/7.11.127.152. spamassassin: 3.3.1. Clear:RC:1(82.141.1.145):SA:0(-1.5/5.0):. Processed in 4.64539 secs); 29 Jan 2014 08:52:14 -0000 Received: from ns.kamp-intra.net (HELO dns.kamp-intra.net) ([82.141.1.145]) by mx01.kamp.de with SMTP; 29 Jan 2014 08:52:09 -0000 X-GL_Whitelist: yes Received: from lieven-pc.kamp-intra.net (lieven-pc.kamp-intra.net [172.21.12.60]) by dns.kamp-intra.net (Postfix) with ESMTP id 53589206AB; Wed, 29 Jan 2014 09:50:29 +0100 (CET) Received: by lieven-pc.kamp-intra.net (Postfix, from userid 1000) id 50752610EA; Wed, 29 Jan 2014 09:50:29 +0100 (CET) From: Peter Lieven To: qemu-devel@nongnu.org Date: Wed, 29 Jan 2014 09:50:23 +0100 Message-Id: <1390985425-13165-4-git-send-email-pl@kamp.de> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1390985425-13165-1-git-send-email-pl@kamp.de> References: <1390985425-13165-1-git-send-email-pl@kamp.de> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a02:248:0:51::16 Cc: Kevin Wolf , Fam Zheng , ronniesahlberg@gmail.com, Jeff Cody , Peter Lieven , Max Reitz , owasserm@redhat.com, Federico Simoncelli , Stefan Hajnoczi , Wenchao Xia Subject: [Qemu-devel] [PATCHv7 3/5] qemu-iotests: enable support for NFS protocol 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 Signed-off-by: Peter Lieven --- tests/qemu-iotests/common | 22 +++++++++++++++++++--- tests/qemu-iotests/common.rc | 3 +++ 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/tests/qemu-iotests/common b/tests/qemu-iotests/common index 8b4e22c..5795358 100644 --- a/tests/qemu-iotests/common +++ b/tests/qemu-iotests/common @@ -144,10 +144,12 @@ check options -vpc test vpc -vhdx test vhdx -vmdk test vmdk + -file test file (default) -rbd test rbd -sheepdog test sheepdog -nbd test nbd -ssh test ssh + -nfs test nfs -xdiff graphical mode diff -nocache use O_DIRECT on backing file -misalign misalign memory allocations @@ -211,22 +213,36 @@ testlist options xpand=false ;; + -file) + IMGPROTO=file + xpand=false + ;; + -rbd) IMGPROTO=rbd xpand=false ;; + -sheepdog) IMGPROTO=sheepdog xpand=false ;; + -nbd) IMGPROTO=nbd xpand=false ;; + -ssh) IMGPROTO=ssh xpand=false ;; + + -nfs) + IMGPROTO=nfs + xpand=false + ;; + -nocache) CACHEMODE="none" CACHEMODE_IS_DEFAULT=false @@ -238,10 +254,10 @@ testlist options xpand=false ;; - -valgrind) - valgrind=true + -valgrind) + valgrind=true xpand=false - ;; + ;; -g) # -g group ... pick from group file group=true diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc index 0f68156..71e9a74 100644 --- a/tests/qemu-iotests/common.rc +++ b/tests/qemu-iotests/common.rc @@ -61,6 +61,9 @@ elif [ "$IMGPROTO" = "nbd" ]; then elif [ "$IMGPROTO" = "ssh" ]; then TEST_IMG_FILE=$TEST_DIR/t.$IMGFMT TEST_IMG="ssh://127.0.0.1$TEST_IMG_FILE" +elif [ "$IMGPROTO" = "nfs" ]; then + TEST_DIR="nfs://127.0.0.1/$TEST_DIR" + TEST_IMG=$TEST_DIR/t.$IMGFMT else TEST_IMG=$IMGPROTO:$TEST_DIR/t.$IMGFMT fi