From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50028) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YC8yB-0001x7-Ql for qemu-devel@nongnu.org; Fri, 16 Jan 2015 10:37:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YC8y7-0000le-I1 for qemu-devel@nongnu.org; Fri, 16 Jan 2015 10:37:55 -0500 Received: from mx1.redhat.com ([209.132.183.28]:44762) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YC8y7-0000lT-61 for qemu-devel@nongnu.org; Fri, 16 Jan 2015 10:37:51 -0500 From: Stefan Hajnoczi Date: Fri, 16 Jan 2015 15:37:13 +0000 Message-Id: <1421422633-25536-17-git-send-email-stefanha@redhat.com> In-Reply-To: <1421422633-25536-1-git-send-email-stefanha@redhat.com> References: <1421422633-25536-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PULL 16/16] qemu-iotests: Fix supported_oses check List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Fam Zheng , Stefan Hajnoczi From: Fam Zheng There is a bug in the recently added sys.platform test, and we no longer run python tests, because "linux2" is the value to compare here. So do a prefix match. According to python doc [1], the way to use sys.platform is "unless you want to test for a specific system version, it is therefore recommended to use the following idiom": if sys.platform.startswith('freebsd'): # FreeBSD-specific code here... elif sys.platform.startswith('linux'): # Linux-specific code here... [1]: https://docs.python.org/2.7/library/sys.html#sys.platform Signed-off-by: Fam Zheng Signed-off-by: Stefan Hajnoczi --- tests/qemu-iotests/iotests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index 87002e0..241b5ee 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -288,7 +288,7 @@ def main(supported_fmts=[], supported_oses=['linux']): if supported_fmts and (imgfmt not in supported_fmts): notrun('not suitable for this image format: %s' % imgfmt) - if sys.platform not in supported_oses: + if True not in [sys.platform.startswith(x) for x in supported_oses]: notrun('not suitable for this OS: %s' % sys.platform) # We need to filter out the time taken from the output so that qemu-iotest -- 2.1.0