From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59063) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YGi85-0003VC-F3 for qemu-devel@nongnu.org; Thu, 29 Jan 2015 00:59:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YGi7v-00086h-W2 for qemu-devel@nongnu.org; Thu, 29 Jan 2015 00:59:01 -0500 Received: from e28smtp08.in.ibm.com ([122.248.162.8]:46850) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YGi7u-000855-NI for qemu-devel@nongnu.org; Thu, 29 Jan 2015 00:58:51 -0500 Received: from /spool/local by e28smtp08.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 29 Jan 2015 11:28:45 +0530 Received: from d28relay05.in.ibm.com (d28relay05.in.ibm.com [9.184.220.62]) by d28dlp02.in.ibm.com (Postfix) with ESMTP id 9338C394005A for ; Thu, 29 Jan 2015 11:28:42 +0530 (IST) Received: from d28av04.in.ibm.com (d28av04.in.ibm.com [9.184.220.66]) by d28relay05.in.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t0T5wf22655730 for ; Thu, 29 Jan 2015 11:28:42 +0530 Received: from d28av04.in.ibm.com (localhost [127.0.0.1]) by d28av04.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id t0T5wfU3026258 for ; Thu, 29 Jan 2015 11:28:41 +0530 Received: from chenxg-ThinkPad-T440p.cn.ibm.com (chenxg-thinkpad-t440p.cn.ibm.com [9.115.114.109] (may be forged)) by d28av04.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id t0T5wd6b025879 for ; Thu, 29 Jan 2015 11:28:41 +0530 From: Xiao Guang Chen Date: Thu, 29 Jan 2015 13:58:34 +0800 Message-Id: <1422511118-13049-3-git-send-email-chenxg@linux.vnet.ibm.com> In-Reply-To: <1422511118-13049-1-git-send-email-chenxg@linux.vnet.ibm.com> References: <1422511118-13049-1-git-send-email-chenxg@linux.vnet.ibm.com> Subject: [Qemu-devel] [-prfix=PATCH v2 RFC 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 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 8ca4011..fc0351d 100755 --- a/tests/qemu-iotests/check +++ b/tests/qemu-iotests/check @@ -323,6 +323,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 bd6790b..73e25da 100644 --- a/tests/qemu-iotests/common.config +++ b/tests/qemu-iotests/common.config @@ -107,6 +107,7 @@ export QEMU=$QEMU_PROG 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 f57f154..69dee95 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