From nobody Wed Feb 11 03:02:28 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1502315834086599.5679523310994; Wed, 9 Aug 2017 14:57:14 -0700 (PDT) Received: from localhost ([::1]:50021 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dfYyW-0003k7-HF for importer@patchew.org; Wed, 09 Aug 2017 17:57:12 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51442) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dfYwi-0002Ph-9q for qemu-devel@nongnu.org; Wed, 09 Aug 2017 17:55:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dfYwg-0006SX-8b for qemu-devel@nongnu.org; Wed, 09 Aug 2017 17:55:20 -0400 Received: from mail-wr0-x242.google.com ([2a00:1450:400c:c0c::242]:34487) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dfYwg-0006SC-2E; Wed, 09 Aug 2017 17:55:18 -0400 Received: by mail-wr0-x242.google.com with SMTP id o33so5313599wrb.1; Wed, 09 Aug 2017 14:55:17 -0700 (PDT) Received: from donizetti.lan (94-39-192-75.adsl-ull.clienti.tiscali.it. [94.39.192.75]) by smtp.gmail.com with ESMTPSA id v41sm4390478wrc.65.2017.08.09.14.55.15 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 Aug 2017 14:55:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=I+slIov0iljRTpSEvLrHrjGOrnctbTsccpIwvwEPnjU=; b=kIzcPaLn63otAqBYULj0dzBxiuhb6dDLEjbYFS5bgqQcaXvhxXkteucyqXScrc7z41 j1+9jFlZ8FemGboZsDnhfpOqxQ0j8CMMgBldukNGrK5zfeKXkUC1kCRKIBKOaHeKGdXd 2xOyw+hPjycy1TpjPoaf+UBlRunJWbcNuQ8piVoJioYsFda2NCsQTKpb+z6ioqNteimD Jm3xSAO9Pb8mzffKmgObK54oIGgwkQDuWQJz32ONdwKFb7/+Fx0kijYbvo4F20xWnhkl 4qOoJyqa4uaiHDVJKKzOG//wm/X89C5lR8llbhJXX7z3QVYcZptOJPWJlc8t4ORek8Un T6Ag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=I+slIov0iljRTpSEvLrHrjGOrnctbTsccpIwvwEPnjU=; b=a7pQGqN2d+7Qoq98tV6FP3FhweaIoiRrkSz8kObg6miAVoHpV1/P/3YC5OkvipB1Sd G28MiPZDlrQeflz4ZRmUmX4QqVbFrv/9YnCfLq0kcxFp3fMYekTuamWqvm1FX5pW9ywJ pGWuu1wwONeKZzCmU4GiaBRExYHnHal2o653iPvRr2Er5ZOEPTOkbezM76zREsmPz8WK IpsOD/71xgN8ZTyg1mDWdJaDKPph2gCUfzIsU3FF1K3BRYJQzf8ahOQVs0JzeAlW1guh Df/AYjaOmrOP3LeZmY7AUE/n4y/Xl1B261uTq9+a0xlgs+ocZqniBF/utr/oqDSEmwSb IcvQ== X-Gm-Message-State: AHYfb5iCa+eCc5xjfIsbYzTRv2D3qE8bSjGsgBV8paQxVPVxoZ7nVGuB h6ANiDNPubxPd+Dq63k= X-Received: by 10.223.187.143 with SMTP id q15mr7882581wrg.16.1502315716622; Wed, 09 Aug 2017 14:55:16 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 9 Aug 2017 23:55:01 +0200 Message-Id: <20170809215510.22802-4-pbonzini@redhat.com> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170809215510.22802-1-pbonzini@redhat.com> References: <20170809215510.22802-1-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::242 Subject: [Qemu-devel] [PATCH 03/12] qemu-iotests: move "check" code out of common.rc X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, qemu-block@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Some functions in common.rc are never used by the tests. Move them out of that file and into common, which is already included only by "check". Code that actually *is* common to "check" and tests can be placed in common.config. Signed-off-by: Paolo Bonzini Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- tests/qemu-iotests/common | 30 ++++++++++++++++++++++++++- tests/qemu-iotests/common.config | 12 +++++++++++ tests/qemu-iotests/common.rc | 45 ------------------------------------= ---- 3 files changed, 41 insertions(+), 46 deletions(-) diff --git a/tests/qemu-iotests/common b/tests/qemu-iotests/common index 130f647a4d..50720f080f 100644 --- a/tests/qemu-iotests/common +++ b/tests/qemu-iotests/common @@ -19,6 +19,29 @@ # common procedures for QA scripts # =20 +_full_imgfmt_details() +{ + if [ -n "$IMGOPTS" ]; then + echo "$IMGFMT ($IMGOPTS)" + else + echo "$IMGFMT" + fi +} + +_full_imgproto_details() +{ + echo "$IMGPROTO" +} + +_full_platform_details() +{ + os=3D`uname -s` + host=3D`hostname -s` + kernel=3D`uname -r` + platform=3D`uname -m` + echo "$os/$platform $host $kernel" +} + diff=3D"diff -u" verbose=3Dfalse debug=3Dfalse @@ -404,7 +427,12 @@ if [ "$IMGOPTSSYNTAX" !=3D "true" ]; then fi =20 # Set default options for qemu-img create -o if they were not specified -_set_default_imgopts +if [ "$IMGFMT" =3D=3D "qcow2" ] && ! (echo "$IMGOPTS" | grep "compat=3D" >= /dev/null); then + IMGOPTS=3D$(_optstr_add "$IMGOPTS" "compat=3D1.1") +fi +if [ "$IMGFMT" =3D=3D "luks" ] && ! (echo "$IMGOPTS" | grep "iter-time=3D"= > /dev/null); then + IMGOPTS=3D$(_optstr_add "$IMGOPTS" "iter-time=3D10") +fi =20 if [ -s $tmp.list ] then diff --git a/tests/qemu-iotests/common.config b/tests/qemu-iotests/common.c= onfig index 0f571d46eb..91da65f3dc 100644 --- a/tests/qemu-iotests/common.config +++ b/tests/qemu-iotests/common.config @@ -27,6 +27,9 @@ export PWD=3D`pwd` =20 export _QEMU_HANDLE=3D0 =20 +# make sure we have a standard umask +umask 022 + # $1 =3D prog to look for, $2* =3D default pathnames if not found in $PATH set_prog_path() { @@ -49,6 +52,15 @@ set_prog_path() return 1 } =20 +_optstr_add() +{ + if [ -n "$1" ]; then + echo "$1,$2" + else + echo "$2" + fi +} + _fatal() { echo "$*" diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc index dd91a2b79a..6f6e03366f 100644 --- a/tests/qemu-iotests/common.rc +++ b/tests/qemu-iotests/common.rc @@ -50,9 +50,6 @@ then fi fi =20 -# make sure we have a standard umask -umask 022 - if [ "$IMGOPTSSYNTAX" =3D "true" ]; then DRIVER=3D"driver=3D$IMGFMT" if [ "$IMGFMT" =3D "luks" ]; then @@ -94,25 +91,6 @@ else fi ORIG_TEST_IMG=3D"$TEST_IMG" =20 -_optstr_add() -{ - if [ -n "$1" ]; then - echo "$1,$2" - else - echo "$2" - fi -} - -_set_default_imgopts() -{ - if [ "$IMGFMT" =3D=3D "qcow2" ] && ! (echo "$IMGOPTS" | grep "compat= =3D" > /dev/null); then - IMGOPTS=3D$(_optstr_add "$IMGOPTS" "compat=3D1.1") - fi - if [ "$IMGFMT" =3D=3D "luks" ] && ! (echo "$IMGOPTS" | grep "iter-time= =3D" > /dev/null); then - IMGOPTS=3D$(_optstr_add "$IMGOPTS" "iter-time=3D10") - fi -} - _use_sample_img() { SAMPLE_IMG_FILE=3D"${1%\.bz2}" @@ -428,28 +406,5 @@ _require_command() [ -x "$c" ] || _notrun "$1 utility required, skipped this test" } =20 -_full_imgfmt_details() -{ - if [ -n "$IMGOPTS" ]; then - echo "$IMGFMT ($IMGOPTS)" - else - echo "$IMGFMT" - fi -} - -_full_imgproto_details() -{ - echo "$IMGPROTO" -} - -_full_platform_details() -{ - os=3D`uname -s` - host=3D`hostname -s` - kernel=3D`uname -r` - platform=3D`uname -m` - echo "$os/$platform $host $kernel" -} - # make sure this script returns success true --=20 2.13.3