From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35955) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YJDN9-0004ro-F1 for qemu-devel@nongnu.org; Wed, 04 Feb 2015 22:45:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YJDMz-00036U-Ve for qemu-devel@nongnu.org; Wed, 04 Feb 2015 22:44:55 -0500 Received: from e28smtp03.in.ibm.com ([122.248.162.3]:35695) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YJDMz-00035Z-B6 for qemu-devel@nongnu.org; Wed, 04 Feb 2015 22:44:45 -0500 Received: from /spool/local by e28smtp03.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 5 Feb 2015 09:14:42 +0530 Received: from d28relay04.in.ibm.com (d28relay04.in.ibm.com [9.184.220.61]) by d28dlp03.in.ibm.com (Postfix) with ESMTP id 58408125804F for ; Thu, 5 Feb 2015 09:15:42 +0530 (IST) Received: from d28av03.in.ibm.com (d28av03.in.ibm.com [9.184.220.65]) by d28relay04.in.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t153idWj45613174 for ; Thu, 5 Feb 2015 09:14:39 +0530 Received: from d28av03.in.ibm.com (localhost [127.0.0.1]) by d28av03.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id t153icGD016645 for ; Thu, 5 Feb 2015 09:14:38 +0530 From: Xiao Guang Chen Date: Thu, 5 Feb 2015 11:44:28 +0800 Message-Id: <1423107872-3268-3-git-send-email-chenxg@linux.vnet.ibm.com> In-Reply-To: <1423107872-3268-1-git-send-email-chenxg@linux.vnet.ibm.com> References: <1423107872-3268-1-git-send-email-chenxg@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH RFC v4 2/6] qemu-iotests: qemu machine type support List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, armbru@redhat.com, mimu@linux.vnet.ibm.com, mreitz@redhat.com From: Mao Chuan Li This patch adds qemu machine type support to the io test suite. Based on the qemu default machine type the reference output file can now vary from the default to a machine specific output file if necessary. That shall allow all platforms to use this test suite. Reviewed-by: Michael Mueller Signed-off-by: Mao Chuan Li --- tests/qemu-iotests/check | 5 +++++ tests/qemu-iotests/common.config | 1 + tests/qemu-iotests/iotests.py | 1 + 3 files changed, 7 insertions(+) diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check index baeae80..c72429b 100755 --- a/tests/qemu-iotests/check +++ b/tests/qemu-iotests/check @@ -324,6 +324,11 @@ do fi reference="$source_iotests/$seq.out" + reference_machine="$source_iotests/$seq.$QEMU_DEFAULT_MACHINE.out" + if [ -f $reference_machine ]; then + reference=$reference_machine + fi + if [ "$CACHEMODE" = "none" ]; then [ -f "$source_iotests/$seq.out.nocache" ] && reference="$source_iotests/$seq.out.nocache" fi diff --git a/tests/qemu-iotests/common.config b/tests/qemu-iotests/common.config index cff91e1..6ded76a 100644 --- a/tests/qemu-iotests/common.config +++ b/tests/qemu-iotests/common.config @@ -107,6 +107,7 @@ export QEMU="$QEMU_PROG $QEMU_OPTIONS" export QEMU_IMG=$QEMU_IMG_PROG export QEMU_IO="$QEMU_IO_PROG $QEMU_IO_OPTIONS" export QEMU_NBD=$QEMU_NBD_PROG +export QEMU_DEFAULT_MACHINE=$($QEMU -machine ? | awk '/(default)/{print $1}') [ -f /etc/qemu-iotest.config ] && . /etc/qemu-iotest.config diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index 87002e0..8d3f047 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -39,6 +39,7 @@ imgproto = os.environ.get('IMGPROTO', 'file') test_dir = os.environ.get('TEST_DIR', '/var/tmp') output_dir = os.environ.get('OUTPUT_DIR', '.') cachemode = os.environ.get('CACHEMODE') +qemu_default_machine = os.environ.get('QEMU_DEFAULT_MACHINE') socket_scm_helper = os.environ.get('SOCKET_SCM_HELPER', 'socket_scm_helper') -- 1.9.1