{"id":812882,"url":"http://patchwork.ozlabs.org/api/patches/812882/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170912144459.11359-4-pbonzini@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170912144459.11359-4-pbonzini@redhat.com>","list_archive_url":null,"date":"2017-09-12T14:44:52","name":"[03/10] qemu-iotests: move \"check\" code out of common.rc","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"7184a9ba9720fd63aa579193f56b0b56cda51d41","submitter":{"id":2701,"url":"http://patchwork.ozlabs.org/api/people/2701/?format=json","name":"Paolo Bonzini","email":"pbonzini@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170912144459.11359-4-pbonzini@redhat.com/mbox/","series":[{"id":2722,"url":"http://patchwork.ozlabs.org/api/series/2722/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=2722","date":"2017-09-12T14:44:51","name":"cleanup qemu-iotests","version":1,"mbox":"http://patchwork.ozlabs.org/series/2722/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/812882/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/812882/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ext-mx02.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx02.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=pbonzini@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xs70G6M5nz9s3T\n\tfor ;\n\tWed, 13 Sep 2017 00:46:22 +1000 (AEST)","from localhost ([::1]:36309 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1drmSC-00046v-S7\n\tfor incoming@patchwork.ozlabs.org; Tue, 12 Sep 2017 10:46:20 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:51693)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1drmRE-0003qS-Bi\n\tfor qemu-devel@nongnu.org; Tue, 12 Sep 2017 10:45:21 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1drmRD-0001p5-8K\n\tfor qemu-devel@nongnu.org; Tue, 12 Sep 2017 10:45:20 -0400","from mx1.redhat.com ([209.132.183.28]:33542)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from )\n\tid 1drmR7-0001k0-0f; Tue, 12 Sep 2017 10:45:13 -0400","from smtp.corp.redhat.com\n\t(int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 0C60F883C2;\n\tTue, 12 Sep 2017 14:45:12 +0000 (UTC)","from donizetti.redhat.com (ovpn-117-43.ams2.redhat.com\n\t[10.36.117.43])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id BDBA277DDD;\n\tTue, 12 Sep 2017 14:45:09 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 0C60F883C2","From":"Paolo Bonzini ","To":"qemu-devel@nongnu.org","Date":"Tue, 12 Sep 2017 16:44:52 +0200","Message-Id":"<20170912144459.11359-4-pbonzini@redhat.com>","In-Reply-To":"<20170912144459.11359-1-pbonzini@redhat.com>","References":"<20170912144459.11359-1-pbonzini@redhat.com>","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.12","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.26]);\n\tTue, 12 Sep 2017 14:45:12 +0000 (UTC)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"[Qemu-devel] [PATCH 03/10] qemu-iotests: move \"check\" code out of\n\tcommon.rc","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"kwolf@redhat.com, qemu-block@nongnu.org","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"Some functions in common.rc are never used by the tests. Move\nthem out of that file and into common, which is already included\nonly by \"check\".\n\nCode that actually *is* common to \"check\" and tests can be placed in\ncommon.config.\n\nSigned-off-by: Paolo Bonzini \n---\n tests/qemu-iotests/common | 25 ++++++++++++++++++++++++-\n tests/qemu-iotests/common.config | 12 ++++++++++++\n tests/qemu-iotests/common.rc | 40 ----------------------------------------\n 3 files changed, 36 insertions(+), 41 deletions(-)","diff":"diff --git a/tests/qemu-iotests/common b/tests/qemu-iotests/common\nindex 130f647a4d..2e98e64d5c 100644\n--- a/tests/qemu-iotests/common\n+++ b/tests/qemu-iotests/common\n@@ -19,6 +19,24 @@\n # common procedures for QA scripts\n #\n \n+_full_imgfmt_details()\n+{\n+ if [ -n \"$IMGOPTS\" ]; then\n+ echo \"$IMGFMT ($IMGOPTS)\"\n+ else\n+ echo \"$IMGFMT\"\n+ fi\n+}\n+\n+_full_platform_details()\n+{\n+ os=`uname -s`\n+ host=`hostname -s`\n+ kernel=`uname -r`\n+ platform=`uname -m`\n+ echo \"$os/$platform $host $kernel\"\n+}\n+\n diff=\"diff -u\"\n verbose=false\n debug=false\n@@ -404,7 +422,12 @@ if [ \"$IMGOPTSSYNTAX\" != \"true\" ]; then\n fi\n \n # Set default options for qemu-img create -o if they were not specified\n-_set_default_imgopts\n+if [ \"$IMGFMT\" == \"qcow2\" ] && ! (echo \"$IMGOPTS\" | grep \"compat=\" > /dev/null); then\n+ IMGOPTS=$(_optstr_add \"$IMGOPTS\" \"compat=1.1\")\n+fi\n+if [ \"$IMGFMT\" == \"luks\" ] && ! (echo \"$IMGOPTS\" | grep \"iter-time=\" > /dev/null); then\n+ IMGOPTS=$(_optstr_add \"$IMGOPTS\" \"iter-time=10\")\n+fi\n \n if [ -s $tmp.list ]\n then\ndiff --git a/tests/qemu-iotests/common.config b/tests/qemu-iotests/common.config\nindex 0f571d46eb..91da65f3dc 100644\n--- a/tests/qemu-iotests/common.config\n+++ b/tests/qemu-iotests/common.config\n@@ -27,6 +27,9 @@ export PWD=`pwd`\n \n export _QEMU_HANDLE=0\n \n+# make sure we have a standard umask\n+umask 022\n+\n # $1 = prog to look for, $2* = default pathnames if not found in $PATH\n set_prog_path()\n {\n@@ -49,6 +52,15 @@ set_prog_path()\n return 1\n }\n \n+_optstr_add()\n+{\n+ if [ -n \"$1\" ]; then\n+ echo \"$1,$2\"\n+ else\n+ echo \"$2\"\n+ fi\n+}\n+\n _fatal()\n {\n echo \"$*\"\ndiff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc\nindex 5938d5145f..6f6e03366f 100644\n--- a/tests/qemu-iotests/common.rc\n+++ b/tests/qemu-iotests/common.rc\n@@ -50,9 +50,6 @@ then\n fi\n fi\n \n-# make sure we have a standard umask\n-umask 022\n-\n if [ \"$IMGOPTSSYNTAX\" = \"true\" ]; then\n DRIVER=\"driver=$IMGFMT\"\n if [ \"$IMGFMT\" = \"luks\" ]; then\n@@ -94,25 +91,6 @@ else\n fi\n ORIG_TEST_IMG=\"$TEST_IMG\"\n \n-_optstr_add()\n-{\n- if [ -n \"$1\" ]; then\n- echo \"$1,$2\"\n- else\n- echo \"$2\"\n- fi\n-}\n-\n-_set_default_imgopts()\n-{\n- if [ \"$IMGFMT\" == \"qcow2\" ] && ! (echo \"$IMGOPTS\" | grep \"compat=\" > /dev/null); then\n- IMGOPTS=$(_optstr_add \"$IMGOPTS\" \"compat=1.1\")\n- fi\n- if [ \"$IMGFMT\" == \"luks\" ] && ! (echo \"$IMGOPTS\" | grep \"iter-time=\" > /dev/null); then\n- IMGOPTS=$(_optstr_add \"$IMGOPTS\" \"iter-time=10\")\n- fi\n-}\n-\n _use_sample_img()\n {\n SAMPLE_IMG_FILE=\"${1%\\.bz2}\"\n@@ -428,23 +406,5 @@ _require_command()\n [ -x \"$c\" ] || _notrun \"$1 utility required, skipped this test\"\n }\n \n-_full_imgfmt_details()\n-{\n- if [ -n \"$IMGOPTS\" ]; then\n- echo \"$IMGFMT ($IMGOPTS)\"\n- else\n- echo \"$IMGFMT\"\n- fi\n-}\n-\n-_full_platform_details()\n-{\n- os=`uname -s`\n- host=`hostname -s`\n- kernel=`uname -r`\n- platform=`uname -m`\n- echo \"$os/$platform $host $kernel\"\n-}\n-\n # make sure this script returns success\n true\n","prefixes":["03/10"]}