From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47028) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XormO-00071w-UX for qemu-devel@nongnu.org; Thu, 13 Nov 2014 05:37:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XormB-0002dK-0o for qemu-devel@nongnu.org; Thu, 13 Nov 2014 05:37:32 -0500 Received: from e23smtp07.au.ibm.com ([202.81.31.140]:49594) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XormA-0002bL-0g for qemu-devel@nongnu.org; Thu, 13 Nov 2014 05:37:18 -0500 Received: from /spool/local by e23smtp07.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 13 Nov 2014 20:37:12 +1000 Received: from d23relay06.au.ibm.com (d23relay06.au.ibm.com [9.185.63.219]) by d23dlp01.au.ibm.com (Postfix) with ESMTP id 9C4762CE8066 for ; Thu, 13 Nov 2014 21:37:10 +1100 (EST) Received: from d23av02.au.ibm.com (d23av02.au.ibm.com [9.190.235.138]) by d23relay06.au.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id sADAasJS37290144 for ; Thu, 13 Nov 2014 21:36:54 +1100 Received: from d23av02.au.ibm.com (localhost [127.0.0.1]) by d23av02.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id sADAbAA4005962 for ; Thu, 13 Nov 2014 21:37:10 +1100 From: Mao Chuan Li Date: Thu, 13 Nov 2014 18:36:54 +0800 Message-Id: <1415875021-15248-3-git-send-email-maochuan@linux.vnet.ibm.com> In-Reply-To: <1415875021-15248-1-git-send-email-maochuan@linux.vnet.ibm.com> References: <1415875021-15248-1-git-send-email-maochuan@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH v1 RFC 2/9] qemu-iotests: qemu machine type support List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Michael Mueller , Mao Chuan Li , Alexander Graf , Christian Borntraeger , Stefan Hajnoczi , Cornelia Huck 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 8e07c19..3025921 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 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.3