From nobody Sat May 4 14:04:10 2024 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; 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 (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1510854140817331.50555497084406; Thu, 16 Nov 2017 09:42:20 -0800 (PST) Received: from localhost ([::1]:42153 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eFOB4-0001no-Vf for importer@patchew.org; Thu, 16 Nov 2017 12:42:15 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59689) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eFO7Q-0007QP-Qu for qemu-devel@nongnu.org; Thu, 16 Nov 2017 12:38:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eFO7P-0002sx-Mw for qemu-devel@nongnu.org; Thu, 16 Nov 2017 12:38:28 -0500 Received: from mx1.redhat.com ([209.132.183.28]:37516) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eFO7M-0002k3-K4; Thu, 16 Nov 2017 12:38:24 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C4E496A7D7; Thu, 16 Nov 2017 17:38:23 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-120-124.rdu2.redhat.com [10.10.120.124]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7CC7B614D0; Thu, 16 Nov 2017 17:38:20 +0000 (UTC) From: Cleber Rosa To: qemu-devel@nongnu.org Date: Thu, 16 Nov 2017 12:38:01 -0500 Message-Id: <20171116173810.16457-2-crosa@redhat.com> In-Reply-To: <20171116173810.16457-1-crosa@redhat.com> References: <20171116173810.16457-1-crosa@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Thu, 16 Nov 2017 17:38:23 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 01/10] qemu-iotests: make execution of tests agnostic to test type 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: Kevin Wolf , Cleber Rosa , qemu-block@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" check makes a distinction on how it runs Python based tests. The current approach is inconsistent because: 1) a large number of Python tests are already set as executable files (eg: 030, 040, 041, 044, 045, 055, 056, 057, 065, 093, 118, 147, 149, 155, 165 and 194) 2) a smaller number of Python tests are not set as executable files 3) the true purpose of a shebang line is to make a file executable, while it currently is used (inconsistently) as a test type flag 4) the same logic could in theory be applied to shell based tests, that is, if first line contains a shell shebang, run it with "$SHELL $test_file", but it'd be pointless IMO, there's no value in the distinction that check makes. Dropping this distinction makes the interface simpler: check requires an executable file. Signed-off-by: Cleber Rosa --- tests/qemu-iotests/096 | 0 tests/qemu-iotests/124 | 0 tests/qemu-iotests/129 | 0 tests/qemu-iotests/132 | 0 tests/qemu-iotests/136 | 0 tests/qemu-iotests/139 | 0 tests/qemu-iotests/148 | 0 tests/qemu-iotests/152 | 0 tests/qemu-iotests/163 | 0 tests/qemu-iotests/check | 9 ++------- 10 files changed, 2 insertions(+), 7 deletions(-) mode change 100644 =3D> 100755 tests/qemu-iotests/096 mode change 100644 =3D> 100755 tests/qemu-iotests/124 mode change 100644 =3D> 100755 tests/qemu-iotests/129 mode change 100644 =3D> 100755 tests/qemu-iotests/132 mode change 100644 =3D> 100755 tests/qemu-iotests/136 mode change 100644 =3D> 100755 tests/qemu-iotests/139 mode change 100644 =3D> 100755 tests/qemu-iotests/148 mode change 100644 =3D> 100755 tests/qemu-iotests/152 mode change 100644 =3D> 100755 tests/qemu-iotests/163 diff --git a/tests/qemu-iotests/096 b/tests/qemu-iotests/096 old mode 100644 new mode 100755 diff --git a/tests/qemu-iotests/124 b/tests/qemu-iotests/124 old mode 100644 new mode 100755 diff --git a/tests/qemu-iotests/129 b/tests/qemu-iotests/129 old mode 100644 new mode 100755 diff --git a/tests/qemu-iotests/132 b/tests/qemu-iotests/132 old mode 100644 new mode 100755 diff --git a/tests/qemu-iotests/136 b/tests/qemu-iotests/136 old mode 100644 new mode 100755 diff --git a/tests/qemu-iotests/139 b/tests/qemu-iotests/139 old mode 100644 new mode 100755 diff --git a/tests/qemu-iotests/148 b/tests/qemu-iotests/148 old mode 100644 new mode 100755 diff --git a/tests/qemu-iotests/152 b/tests/qemu-iotests/152 old mode 100644 new mode 100755 diff --git a/tests/qemu-iotests/163 b/tests/qemu-iotests/163 old mode 100644 new mode 100755 diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check index e6b6ff7a04..08741328d0 100755 --- a/tests/qemu-iotests/check +++ b/tests/qemu-iotests/check @@ -741,20 +741,15 @@ do start=3D`_wallclock` $timestamp && printf %s " [$(date "+%T")]" =20 - if [ "$(head -n 1 "$source_iotests/$seq")" =3D=3D "#!/usr/bin/env = python" ]; then - run_command=3D"$PYTHON $seq" - else - run_command=3D"./$seq" - fi export OUTPUT_DIR=3D$PWD if $debug; then (cd "$source_iotests"; MALLOC_PERTURB_=3D${MALLOC_PERTURB_:-$(($RANDOM % 255 + 1))} \ - $run_command -d 2>&1 | tee $tmp.out) + ./$seq -d 2>&1 | tee $tmp.out) else (cd "$source_iotests"; MALLOC_PERTURB_=3D${MALLOC_PERTURB_:-$(($RANDOM % 255 + 1))} \ - $run_command >$tmp.out 2>&1) + ./$seq >$tmp.out 2>&1) fi sts=3D$? $timestamp && _timestamp --=20 2.13.6 From nobody Sat May 4 14:04:10 2024 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; 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 (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1510854058775125.51663697480717; Thu, 16 Nov 2017 09:40:58 -0800 (PST) Received: from localhost ([::1]:42134 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eFO9Q-0000Hx-Je for importer@patchew.org; Thu, 16 Nov 2017 12:40:32 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59683) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eFO7Q-0007Q2-6E for qemu-devel@nongnu.org; Thu, 16 Nov 2017 12:38:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eFO7P-0002sn-Gl for qemu-devel@nongnu.org; Thu, 16 Nov 2017 12:38:28 -0500 Received: from mx1.redhat.com ([209.132.183.28]:53116) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eFO7N-0002mf-F7; Thu, 16 Nov 2017 12:38:25 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 935358763A; Thu, 16 Nov 2017 17:38:24 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-120-124.rdu2.redhat.com [10.10.120.124]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E60F860602; Thu, 16 Nov 2017 17:38:23 +0000 (UTC) From: Cleber Rosa To: qemu-devel@nongnu.org Date: Thu, 16 Nov 2017 12:38:02 -0500 Message-Id: <20171116173810.16457-3-crosa@redhat.com> In-Reply-To: <20171116173810.16457-1-crosa@redhat.com> References: <20171116173810.16457-1-crosa@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Thu, 16 Nov 2017 17:38:24 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 02/10] qemu-iotests: fix filename containing checks 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: Kevin Wolf , Cleber Rosa , qemu-block@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Commit cce293a2945 moved some functions from common.config to common.rc, but the error messages still reference the old file location. Signed-off-by: Cleber Rosa Reviewed-by: Max Reitz --- tests/qemu-iotests/common.rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc index dbae7d74ba..dcabe4c7cc 100644 --- a/tests/qemu-iotests/common.rc +++ b/tests/qemu-iotests/common.rc @@ -169,12 +169,12 @@ if [ ! -e "$TEST_DIR" ]; then fi =20 if [ ! -d "$TEST_DIR" ]; then - echo "common.config: Error: \$TEST_DIR ($TEST_DIR) is not a directory" + echo "common.rc: Error: \$TEST_DIR ($TEST_DIR) is not a directory" exit 1 fi =20 if [ ! -d "$SAMPLE_IMG_DIR" ]; then - echo "common.config: Error: \$SAMPLE_IMG_DIR ($SAMPLE_IMG_DIR) is not = a directory" + echo "common.rc: Error: \$SAMPLE_IMG_DIR ($SAMPLE_IMG_DIR) is not a di= rectory" exit 1 fi =20 --=20 2.13.6 From nobody Sat May 4 14:04:10 2024 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; 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 (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1510854209739930.7616943730243; Thu, 16 Nov 2017 09:43:29 -0800 (PST) Received: from localhost ([::1]:42158 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eFOCB-0002yk-Mr for importer@patchew.org; Thu, 16 Nov 2017 12:43:23 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59892) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eFO7g-0007cx-21 for qemu-devel@nongnu.org; Thu, 16 Nov 2017 12:38:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eFO7Z-0003Gq-OJ for qemu-devel@nongnu.org; Thu, 16 Nov 2017 12:38:44 -0500 Received: from mx1.redhat.com ([209.132.183.28]:53188) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eFO7O-0002pA-Hp; Thu, 16 Nov 2017 12:38:26 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id AF960C047B63; Thu, 16 Nov 2017 17:38:25 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-120-124.rdu2.redhat.com [10.10.120.124]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B89CB60602; Thu, 16 Nov 2017 17:38:24 +0000 (UTC) From: Cleber Rosa To: qemu-devel@nongnu.org Date: Thu, 16 Nov 2017 12:38:03 -0500 Message-Id: <20171116173810.16457-4-crosa@redhat.com> In-Reply-To: <20171116173810.16457-1-crosa@redhat.com> References: <20171116173810.16457-1-crosa@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Thu, 16 Nov 2017 17:38:25 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 03/10] qemu-iotests: be strict with expected output 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: Kevin Wolf , Cleber Rosa , qemu-block@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The contract between runner (check) and test is one that accepts some minor differences in the expcted output, as the comparison method employed is a "diff -w". This is an exception to a clearer and more straightforward rule of just requiring the generated output to be *equal* (and not similar) to the recorded expected output. Let's drop this exception and make things more predictable. Signed-off-by: Cleber Rosa --- tests/qemu-iotests/026.out | 92 +++++++++++++++++++++++-------------------= ---- tests/qemu-iotests/049.out | 4 +- tests/qemu-iotests/061.out | 4 +- tests/qemu-iotests/104.out | 2 +- tests/qemu-iotests/109.out | 44 +++++++++++----------- tests/qemu-iotests/175.out | 2 +- tests/qemu-iotests/check | 4 +- 7 files changed, 76 insertions(+), 76 deletions(-) diff --git a/tests/qemu-iotests/026.out b/tests/qemu-iotests/026.out index 86a50a2e13..38d76418b7 100644 --- a/tests/qemu-iotests/026.out +++ b/tests/qemu-iotests/026.out @@ -3,7 +3,7 @@ Errors while writing 128 kB =20 Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 -Event: l1_update; errno: 5; imm: off; once: on; write +Event: l1_update; errno: 5; imm: off; once: on; write=20 write failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 @@ -13,7 +13,7 @@ write failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 -Event: l1_update; errno: 5; imm: off; once: off; write +Event: l1_update; errno: 5; imm: off; once: off; write=20 Failed to flush the L2 table cache: Input/output error Failed to flush the refcount block cache: Input/output error write failed: Input/output error @@ -31,7 +31,7 @@ write failed: Input/output error This means waste of disk space, but no harm to data. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 -Event: l1_update; errno: 28; imm: off; once: on; write +Event: l1_update; errno: 28; imm: off; once: on; write=20 write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 @@ -41,7 +41,7 @@ write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 -Event: l1_update; errno: 28; imm: off; once: off; write +Event: l1_update; errno: 28; imm: off; once: off; write=20 Failed to flush the L2 table cache: No space left on device Failed to flush the refcount block cache: No space left on device write failed: No space left on device @@ -59,7 +59,7 @@ write failed: No space left on device This means waste of disk space, but no harm to data. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 -Event: l2_load; errno: 5; imm: off; once: on; write +Event: l2_load; errno: 5; imm: off; once: on; write=20 wrote 131072/131072 bytes at offset 0 128 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) write failed: Input/output error @@ -75,7 +75,7 @@ read failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 -Event: l2_load; errno: 5; imm: off; once: off; write +Event: l2_load; errno: 5; imm: off; once: off; write=20 wrote 131072/131072 bytes at offset 0 128 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) write failed: Input/output error @@ -91,7 +91,7 @@ read failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 -Event: l2_load; errno: 28; imm: off; once: on; write +Event: l2_load; errno: 28; imm: off; once: on; write=20 wrote 131072/131072 bytes at offset 0 128 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) write failed: No space left on device @@ -107,7 +107,7 @@ read failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 -Event: l2_load; errno: 28; imm: off; once: off; write +Event: l2_load; errno: 28; imm: off; once: off; write=20 wrote 131072/131072 bytes at offset 0 128 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) write failed: No space left on device @@ -123,7 +123,7 @@ read failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 -Event: l2_update; errno: 5; imm: off; once: on; write +Event: l2_update; errno: 5; imm: off; once: on; write=20 write failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 @@ -133,7 +133,7 @@ write failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 -Event: l2_update; errno: 5; imm: off; once: off; write +Event: l2_update; errno: 5; imm: off; once: off; write=20 Failed to flush the L2 table cache: Input/output error Failed to flush the refcount block cache: Input/output error write failed: Input/output error @@ -151,7 +151,7 @@ write failed: Input/output error This means waste of disk space, but no harm to data. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 -Event: l2_update; errno: 28; imm: off; once: on; write +Event: l2_update; errno: 28; imm: off; once: on; write=20 write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 @@ -161,7 +161,7 @@ write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 -Event: l2_update; errno: 28; imm: off; once: off; write +Event: l2_update; errno: 28; imm: off; once: off; write=20 Failed to flush the L2 table cache: No space left on device Failed to flush the refcount block cache: No space left on device write failed: No space left on device @@ -179,7 +179,7 @@ write failed: No space left on device This means waste of disk space, but no harm to data. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 -Event: l2_alloc_write; errno: 5; imm: off; once: on; write +Event: l2_alloc_write; errno: 5; imm: off; once: on; write=20 write failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 @@ -189,7 +189,7 @@ write failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 -Event: l2_alloc_write; errno: 5; imm: off; once: off; write +Event: l2_alloc_write; errno: 5; imm: off; once: off; write=20 Failed to flush the L2 table cache: Input/output error Failed to flush the refcount block cache: Input/output error write failed: Input/output error @@ -205,7 +205,7 @@ write failed: Input/output error This means waste of disk space, but no harm to data. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 -Event: l2_alloc_write; errno: 28; imm: off; once: on; write +Event: l2_alloc_write; errno: 28; imm: off; once: on; write=20 write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 @@ -215,7 +215,7 @@ write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 -Event: l2_alloc_write; errno: 28; imm: off; once: off; write +Event: l2_alloc_write; errno: 28; imm: off; once: off; write=20 Failed to flush the L2 table cache: No space left on device Failed to flush the refcount block cache: No space left on device write failed: No space left on device @@ -231,7 +231,7 @@ write failed: No space left on device This means waste of disk space, but no harm to data. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 -Event: write_aio; errno: 5; imm: off; once: on; write +Event: write_aio; errno: 5; imm: off; once: on; write=20 write failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 @@ -241,7 +241,7 @@ write failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 -Event: write_aio; errno: 5; imm: off; once: off; write +Event: write_aio; errno: 5; imm: off; once: off; write=20 Failed to flush the L2 table cache: Input/output error Failed to flush the refcount block cache: Input/output error write failed: Input/output error @@ -255,7 +255,7 @@ write failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 -Event: write_aio; errno: 28; imm: off; once: on; write +Event: write_aio; errno: 28; imm: off; once: on; write=20 write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 @@ -265,7 +265,7 @@ write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 -Event: write_aio; errno: 28; imm: off; once: off; write +Event: write_aio; errno: 28; imm: off; once: off; write=20 Failed to flush the L2 table cache: No space left on device Failed to flush the refcount block cache: No space left on device write failed: No space left on device @@ -279,7 +279,7 @@ write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 -Event: refblock_load; errno: 5; imm: off; once: on; write +Event: refblock_load; errno: 5; imm: off; once: on; write=20 write failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 @@ -289,7 +289,7 @@ write failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 -Event: refblock_load; errno: 5; imm: off; once: off; write +Event: refblock_load; errno: 5; imm: off; once: off; write=20 Failed to flush the L2 table cache: Input/output error Failed to flush the refcount block cache: Input/output error write failed: Input/output error @@ -303,7 +303,7 @@ write failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 -Event: refblock_load; errno: 28; imm: off; once: on; write +Event: refblock_load; errno: 28; imm: off; once: on; write=20 write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 @@ -313,7 +313,7 @@ write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 -Event: refblock_load; errno: 28; imm: off; once: off; write +Event: refblock_load; errno: 28; imm: off; once: off; write=20 Failed to flush the L2 table cache: No space left on device Failed to flush the refcount block cache: No space left on device write failed: No space left on device @@ -327,7 +327,7 @@ write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 -Event: refblock_update_part; errno: 5; imm: off; once: on; write +Event: refblock_update_part; errno: 5; imm: off; once: on; write=20 write failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 @@ -337,7 +337,7 @@ write failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 -Event: refblock_update_part; errno: 5; imm: off; once: off; write +Event: refblock_update_part; errno: 5; imm: off; once: off; write=20 Failed to flush the L2 table cache: Input/output error Failed to flush the refcount block cache: Input/output error write failed: Input/output error @@ -351,7 +351,7 @@ write failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 -Event: refblock_update_part; errno: 28; imm: off; once: on; write +Event: refblock_update_part; errno: 28; imm: off; once: on; write=20 write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 @@ -361,7 +361,7 @@ write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 -Event: refblock_update_part; errno: 28; imm: off; once: off; write +Event: refblock_update_part; errno: 28; imm: off; once: off; write=20 Failed to flush the L2 table cache: No space left on device Failed to flush the refcount block cache: No space left on device write failed: No space left on device @@ -375,7 +375,7 @@ write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 -Event: refblock_alloc; errno: 5; imm: off; once: on; write +Event: refblock_alloc; errno: 5; imm: off; once: on; write=20 write failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 @@ -385,7 +385,7 @@ write failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 -Event: refblock_alloc; errno: 5; imm: off; once: off; write +Event: refblock_alloc; errno: 5; imm: off; once: off; write=20 Failed to flush the L2 table cache: Input/output error Failed to flush the refcount block cache: Input/output error write failed: Input/output error @@ -399,7 +399,7 @@ write failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 -Event: refblock_alloc; errno: 28; imm: off; once: on; write +Event: refblock_alloc; errno: 28; imm: off; once: on; write=20 write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 @@ -409,7 +409,7 @@ write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 -Event: refblock_alloc; errno: 28; imm: off; once: off; write +Event: refblock_alloc; errno: 28; imm: off; once: off; write=20 Failed to flush the L2 table cache: No space left on device Failed to flush the refcount block cache: No space left on device write failed: No space left on device @@ -423,7 +423,7 @@ write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 -Event: cluster_alloc; errno: 5; imm: off; once: on; write +Event: cluster_alloc; errno: 5; imm: off; once: on; write=20 write failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 @@ -433,7 +433,7 @@ write failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 -Event: cluster_alloc; errno: 5; imm: off; once: off; write +Event: cluster_alloc; errno: 5; imm: off; once: off; write=20 write failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 @@ -443,7 +443,7 @@ write failed: Input/output error No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 -Event: cluster_alloc; errno: 28; imm: off; once: on; write +Event: cluster_alloc; errno: 28; imm: off; once: on; write=20 write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 @@ -453,7 +453,7 @@ write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 -Event: cluster_alloc; errno: 28; imm: off; once: off; write +Event: cluster_alloc; errno: 28; imm: off; once: off; write=20 write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 @@ -466,7 +466,7 @@ No errors were found on the image. =20 Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 -Event: refblock_alloc_hookup; errno: 28; imm: off; once: on; write +Event: refblock_alloc_hookup; errno: 28; imm: off; once: on; write=20 write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 @@ -476,7 +476,7 @@ write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 -Event: refblock_alloc_hookup; errno: 28; imm: off; once: off; write +Event: refblock_alloc_hookup; errno: 28; imm: off; once: off; write=20 Failed to flush the L2 table cache: No space left on device Failed to flush the refcount block cache: No space left on device write failed: No space left on device @@ -494,7 +494,7 @@ write failed: No space left on device This means waste of disk space, but no harm to data. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 -Event: refblock_alloc_write; errno: 28; imm: off; once: on; write +Event: refblock_alloc_write; errno: 28; imm: off; once: on; write=20 write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 @@ -504,7 +504,7 @@ write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 -Event: refblock_alloc_write; errno: 28; imm: off; once: off; write +Event: refblock_alloc_write; errno: 28; imm: off; once: off; write=20 Failed to flush the L2 table cache: No space left on device Failed to flush the refcount block cache: No space left on device write failed: No space left on device @@ -518,7 +518,7 @@ write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 -Event: refblock_alloc_write_blocks; errno: 28; imm: off; once: on; write +Event: refblock_alloc_write_blocks; errno: 28; imm: off; once: on; write=20 write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 @@ -528,7 +528,7 @@ write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 -Event: refblock_alloc_write_blocks; errno: 28; imm: off; once: off; write +Event: refblock_alloc_write_blocks; errno: 28; imm: off; once: off; write=20 Failed to flush the L2 table cache: No space left on device Failed to flush the refcount block cache: No space left on device write failed: No space left on device @@ -546,7 +546,7 @@ write failed: No space left on device This means waste of disk space, but no harm to data. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 -Event: refblock_alloc_write_table; errno: 28; imm: off; once: on; write +Event: refblock_alloc_write_table; errno: 28; imm: off; once: on; write=20 write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 @@ -556,7 +556,7 @@ write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 -Event: refblock_alloc_write_table; errno: 28; imm: off; once: off; write +Event: refblock_alloc_write_table; errno: 28; imm: off; once: off; write=20 Failed to flush the L2 table cache: No space left on device Failed to flush the refcount block cache: No space left on device write failed: No space left on device @@ -574,7 +574,7 @@ write failed: No space left on device This means waste of disk space, but no harm to data. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 -Event: refblock_alloc_switch_table; errno: 28; imm: off; once: on; write +Event: refblock_alloc_switch_table; errno: 28; imm: off; once: on; write=20 write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 @@ -584,7 +584,7 @@ write failed: No space left on device No errors were found on the image. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 =20 -Event: refblock_alloc_switch_table; errno: 28; imm: off; once: off; write +Event: refblock_alloc_switch_table; errno: 28; imm: off; once: off; write=20 Failed to flush the L2 table cache: No space left on device Failed to flush the refcount block cache: No space left on device write failed: No space left on device diff --git a/tests/qemu-iotests/049.out b/tests/qemu-iotests/049.out index 003247023e..5a93d8fc4b 100644 --- a/tests/qemu-iotests/049.out +++ b/tests/qemu-iotests/049.out @@ -106,7 +106,7 @@ qemu-img: Value '-1k' is out of range for parameter 'si= ze' qemu-img: TEST_DIR/t.qcow2: Invalid options for file format 'qcow2' =20 qemu-img create -f qcow2 TEST_DIR/t.qcow2 -- 1kilobyte -qemu-img: Invalid image size specified! You may use k, M, G, T, P or E suf= fixes for +qemu-img: Invalid image size specified! You may use k, M, G, T, P or E suf= fixes for=20 qemu-img: kilobytes, megabytes, gigabytes, terabytes, petabytes and exabyt= es. =20 qemu-img create -f qcow2 -o size=3D1kilobyte TEST_DIR/t.qcow2 @@ -116,7 +116,7 @@ and exabytes, respectively. qemu-img: TEST_DIR/t.qcow2: Invalid options for file format 'qcow2' =20 qemu-img create -f qcow2 TEST_DIR/t.qcow2 -- foobar -qemu-img: Invalid image size specified! You may use k, M, G, T, P or E suf= fixes for +qemu-img: Invalid image size specified! You may use k, M, G, T, P or E suf= fixes for=20 qemu-img: kilobytes, megabytes, gigabytes, terabytes, petabytes and exabyt= es. =20 qemu-img create -f qcow2 -o size=3Dfoobar TEST_DIR/t.qcow2 diff --git a/tests/qemu-iotests/061.out b/tests/qemu-iotests/061.out index 942485de99..3dbbeb73ff 100644 --- a/tests/qemu-iotests/061.out +++ b/tests/qemu-iotests/061.out @@ -417,7 +417,7 @@ wrote 65536/65536 bytes at offset 2147483648 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) wrote 65536/65536 bytes at offset 3221225472 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) - (0.00/100%) (12.50/100%) (25.00/100%) (37.50/100%) (50.00/100%) (62.50/100%) (75.00/100%) (87.50/100%) (100.00/100%) (100.00/100%) + (0.00/100%) (12.50/100%) (25.00/100%) (37.50/100%) (50.00/100%) (62.50/100%) (75.00/100%) (87.50/100%) (100.00/100%) (100.00/100%) No errors were found on the image. =20 =3D=3D=3D Testing progress report with snapshot =3D=3D=3D @@ -432,6 +432,6 @@ wrote 65536/65536 bytes at offset 2147483648 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) wrote 65536/65536 bytes at offset 3221225472 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) - (0.00/100%) (6.25/100%) (12.50/100%) (18.75/100%) (25.00/100%) (31.25/100%) (37.50/100%) (43.75/100%) (50.00/100%) (56.25/100%) (62.50/100%) (68.75/100%) (75.00/100%) (81.25/100%) (87.50/100%) (93.75/100%) (100.00/100%) (100.00/100%) + (0.00/100%) (6.25/100%) (12.50/100%) (18.75/100%) (25.00/100%) (31.25/100%) (37.50/100%) (43.75/100%) (50.00/100%) (56.25/100%) (62.50/100%) (68.75/100%) (75.00/100%) (81.25/100%) (87.50/100%) (93.75/100%) (100.00/100%) (100.00/100%) No errors were found on the image. *** done diff --git a/tests/qemu-iotests/104.out b/tests/qemu-iotests/104.out index ab8d892c2a..f9f59d2950 100644 --- a/tests/qemu-iotests/104.out +++ b/tests/qemu-iotests/104.out @@ -9,4 +9,4 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1234 image: TEST_DIR/t.IMGFMT file format: IMGFMT virtual size: 1.5K (1536 bytes) -***done +*** done diff --git a/tests/qemu-iotests/109.out b/tests/qemu-iotests/109.out index c189e2833d..4fcb497e5e 100644 --- a/tests/qemu-iotests/109.out +++ b/tests/qemu-iotests/109.out @@ -6,8 +6,8 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D67108864 Formatting 'TEST_DIR/t.raw.src', fmt=3DIMGFMT size=3D67108864 {"return": {}} WARNING: Image format was not specified for 'TEST_DIR/t.raw' and probing g= uessed raw. -Automatically detecting the format is dangerous for raw images, write oper= ations on block 0 will be restricted. -Specify the 'raw' format explicitly to remove the restrictions. + Automatically detecting the format is dangerous for raw images, w= rite operations on block 0 will be restricted. + Specify the 'raw' format explicitly to remove the restrictions. {"return": {}} {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "BLOCK_JOB_ERROR", "data": {"device": "src", "operation": "write", "actio= n": "report"}} {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "BLOCK_JOB_COMPLETED", "data": {"device": "src", "len": LEN, "offset": 0,= "speed": 0, "type": "mirror", "error": "Operation not permitted"}} @@ -32,8 +32,8 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D67108= 864 Formatting 'TEST_DIR/t.raw.src', fmt=3DIMGFMT size=3D67108864 {"return": {}} WARNING: Image format was not specified for 'TEST_DIR/t.raw' and probing g= uessed raw. -Automatically detecting the format is dangerous for raw images, write oper= ations on block 0 will be restricted. -Specify the 'raw' format explicitly to remove the restrictions. + Automatically detecting the format is dangerous for raw images, w= rite operations on block 0 will be restricted. + Specify the 'raw' format explicitly to remove the restrictions. {"return": {}} {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "BLOCK_JOB_ERROR", "data": {"device": "src", "operation": "write", "actio= n": "report"}} {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "BLOCK_JOB_COMPLETED", "data": {"device": "src", "len": LEN, "offset": 51= 2, "speed": 0, "type": "mirror", "error": "Operation not permitted"}} @@ -58,8 +58,8 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D67108= 864 Formatting 'TEST_DIR/t.raw.src', fmt=3DIMGFMT size=3D67108864 {"return": {}} WARNING: Image format was not specified for 'TEST_DIR/t.raw' and probing g= uessed raw. -Automatically detecting the format is dangerous for raw images, write oper= ations on block 0 will be restricted. -Specify the 'raw' format explicitly to remove the restrictions. + Automatically detecting the format is dangerous for raw images, w= rite operations on block 0 will be restricted. + Specify the 'raw' format explicitly to remove the restrictions. {"return": {}} {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "BLOCK_JOB_ERROR", "data": {"device": "src", "operation": "write", "actio= n": "report"}} {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "BLOCK_JOB_COMPLETED", "data": {"device": "src", "len": LEN, "offset": 26= 2144, "speed": 0, "type": "mirror", "error": "Operation not permitted"}} @@ -84,8 +84,8 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D67108= 864 Formatting 'TEST_DIR/t.raw.src', fmt=3DIMGFMT size=3D67108864 {"return": {}} WARNING: Image format was not specified for 'TEST_DIR/t.raw' and probing g= uessed raw. -Automatically detecting the format is dangerous for raw images, write oper= ations on block 0 will be restricted. -Specify the 'raw' format explicitly to remove the restrictions. + Automatically detecting the format is dangerous for raw images, w= rite operations on block 0 will be restricted. + Specify the 'raw' format explicitly to remove the restrictions. {"return": {}} {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "BLOCK_JOB_ERROR", "data": {"device": "src", "operation": "write", "actio= n": "report"}} {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "BLOCK_JOB_COMPLETED", "data": {"device": "src", "len": LEN, "offset": 0,= "speed": 0, "type": "mirror", "error": "Operation not permitted"}} @@ -110,8 +110,8 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D671= 08864 Formatting 'TEST_DIR/t.raw.src', fmt=3DIMGFMT size=3D67108864 {"return": {}} WARNING: Image format was not specified for 'TEST_DIR/t.raw' and probing g= uessed raw. -Automatically detecting the format is dangerous for raw images, write oper= ations on block 0 will be restricted. -Specify the 'raw' format explicitly to remove the restrictions. + Automatically detecting the format is dangerous for raw images, w= rite operations on block 0 will be restricted. + Specify the 'raw' format explicitly to remove the restrictions. {"return": {}} {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "BLOCK_JOB_ERROR", "data": {"device": "src", "operation": "write", "actio= n": "report"}} {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "BLOCK_JOB_COMPLETED", "data": {"device": "src", "len": LEN, "offset": 0,= "speed": 0, "type": "mirror", "error": "Operation not permitted"}} @@ -136,8 +136,8 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D671= 08864 Formatting 'TEST_DIR/t.raw.src', fmt=3DIMGFMT size=3D67108864 {"return": {}} WARNING: Image format was not specified for 'TEST_DIR/t.raw' and probing g= uessed raw. -Automatically detecting the format is dangerous for raw images, write oper= ations on block 0 will be restricted. -Specify the 'raw' format explicitly to remove the restrictions. + Automatically detecting the format is dangerous for raw images, w= rite operations on block 0 will be restricted. + Specify the 'raw' format explicitly to remove the restrictions. {"return": {}} {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "BLOCK_JOB_ERROR", "data": {"device": "src", "operation": "write", "actio= n": "report"}} {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "BLOCK_JOB_COMPLETED", "data": {"device": "src", "len": LEN, "offset": 0,= "speed": 0, "type": "mirror", "error": "Operation not permitted"}} @@ -161,8 +161,8 @@ Images are identical. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D67108864 {"return": {}} WARNING: Image format was not specified for 'TEST_DIR/t.raw' and probing g= uessed raw. -Automatically detecting the format is dangerous for raw images, write oper= ations on block 0 will be restricted. -Specify the 'raw' format explicitly to remove the restrictions. + Automatically detecting the format is dangerous for raw images, w= rite operations on block 0 will be restricted. + Specify the 'raw' format explicitly to remove the restrictions. {"return": {}} {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "BLOCK_JOB_ERROR", "data": {"device": "src", "operation": "write", "actio= n": "report"}} {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "BLOCK_JOB_COMPLETED", "data": {"device": "src", "len": LEN, "offset": OF= FSET, "speed": 0, "type": "mirror", "error": "Operation not permitted"}} @@ -186,8 +186,8 @@ Images are identical. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D67108864 {"return": {}} WARNING: Image format was not specified for 'TEST_DIR/t.raw' and probing g= uessed raw. -Automatically detecting the format is dangerous for raw images, write oper= ations on block 0 will be restricted. -Specify the 'raw' format explicitly to remove the restrictions. + Automatically detecting the format is dangerous for raw images, w= rite operations on block 0 will be restricted. + Specify the 'raw' format explicitly to remove the restrictions. {"return": {}} {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "BLOCK_JOB_ERROR", "data": {"device": "src", "operation": "write", "actio= n": "report"}} {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "BLOCK_JOB_COMPLETED", "data": {"device": "src", "len": LEN, "offset": OF= FSET, "speed": 0, "type": "mirror", "error": "Operation not permitted"}} @@ -211,8 +211,8 @@ Images are identical. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D67108864 {"return": {}} WARNING: Image format was not specified for 'TEST_DIR/t.raw' and probing g= uessed raw. -Automatically detecting the format is dangerous for raw images, write oper= ations on block 0 will be restricted. -Specify the 'raw' format explicitly to remove the restrictions. + Automatically detecting the format is dangerous for raw images, w= rite operations on block 0 will be restricted. + Specify the 'raw' format explicitly to remove the restrictions. {"return": {}} {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "BLOCK_JOB_ERROR", "data": {"device": "src", "operation": "write", "actio= n": "report"}} {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "BLOCK_JOB_COMPLETED", "data": {"device": "src", "len": LEN, "offset": OF= FSET, "speed": 0, "type": "mirror", "error": "Operation not permitted"}} @@ -236,8 +236,8 @@ Images are identical. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D67108864 {"return": {}} WARNING: Image format was not specified for 'TEST_DIR/t.raw' and probing g= uessed raw. -Automatically detecting the format is dangerous for raw images, write oper= ations on block 0 will be restricted. -Specify the 'raw' format explicitly to remove the restrictions. + Automatically detecting the format is dangerous for raw images, w= rite operations on block 0 will be restricted. + Specify the 'raw' format explicitly to remove the restrictions. {"return": {}} {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "BLOCK_JOB_ERROR", "data": {"device": "src", "operation": "write", "actio= n": "report"}} {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "BLOCK_JOB_COMPLETED", "data": {"device": "src", "len": LEN, "offset": OF= FSET, "speed": 0, "type": "mirror", "error": "Operation not permitted"}} @@ -261,8 +261,8 @@ Images are identical. Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D67108864 {"return": {}} WARNING: Image format was not specified for 'TEST_DIR/t.raw' and probing g= uessed raw. -Automatically detecting the format is dangerous for raw images, write oper= ations on block 0 will be restricted. -Specify the 'raw' format explicitly to remove the restrictions. + Automatically detecting the format is dangerous for raw images, w= rite operations on block 0 will be restricted. + Specify the 'raw' format explicitly to remove the restrictions. {"return": {}} {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "BLOCK_JOB_READY", "data": {"device": "src", "len": 512, "offset": 512, "= speed": 0, "type": "mirror"}} {"return": [{"io-status": "ok", "device": "src", "busy": false, "len": 512= , "offset": 512, "paused": false, "speed": 0, "ready": true, "type": "mirro= r"}]} diff --git a/tests/qemu-iotests/175.out b/tests/qemu-iotests/175.out index 76c02c6a57..53c5186dbd 100644 --- a/tests/qemu-iotests/175.out +++ b/tests/qemu-iotests/175.out @@ -15,4 +15,4 @@ size=3D1048576, blocks=3D2048 =3D=3D creating image with preallocation falloc =3D=3D Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1048576 preallocation= =3Dfalloc size=3D1048576, blocks=3D2048 - *** done +*** done diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check index 08741328d0..7718b98bc4 100755 --- a/tests/qemu-iotests/check +++ b/tests/qemu-iotests/check @@ -795,7 +795,7 @@ do echo " - no qualified output" err=3Dtrue else - if diff -w "$reference" $tmp.out >/dev/null 2>&1 + if diff "$reference" $tmp.out >/dev/null 2>&1 then echo "" if $err @@ -807,7 +807,7 @@ do else echo " - output mismatch (see $seq.out.bad)" mv $tmp.out $seq.out.bad - $diff -w "$reference" $(realpath $seq.out.bad) + $diff "$reference" $(realpath $seq.out.bad) err=3Dtrue fi fi --=20 2.13.6 From nobody Sat May 4 14:04:10 2024 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; 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 (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1510854246063999.4348392322476; Thu, 16 Nov 2017 09:44:06 -0800 (PST) Received: from localhost ([::1]:42163 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eFOCl-0003RB-UB for importer@patchew.org; Thu, 16 Nov 2017 12:43:59 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59971) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eFO7p-0007is-9y for qemu-devel@nongnu.org; Thu, 16 Nov 2017 12:39:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eFO7h-0003cs-Uy for qemu-devel@nongnu.org; Thu, 16 Nov 2017 12:38:53 -0500 Received: from mx1.redhat.com ([209.132.183.28]:44116) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eFO7P-0002rU-Ie; Thu, 16 Nov 2017 12:38:27 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B2FBB13A49; Thu, 16 Nov 2017 17:38:26 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-120-124.rdu2.redhat.com [10.10.120.124]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D505E614C8; Thu, 16 Nov 2017 17:38:25 +0000 (UTC) From: Cleber Rosa To: qemu-devel@nongnu.org Date: Thu, 16 Nov 2017 12:38:04 -0500 Message-Id: <20171116173810.16457-5-crosa@redhat.com> In-Reply-To: <20171116173810.16457-1-crosa@redhat.com> References: <20171116173810.16457-1-crosa@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Thu, 16 Nov 2017 17:38:26 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 04/10] qemu-iotests: include (source) filters from 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: Kevin Wolf , Cleber Rosa , qemu-block@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" There's an explicit dependency from common.rc on common.filters, that is, it consumes functions defined there. Just like common.config is included in common.rc, it makes sense to also sense common.filter. This drops the requirement on individual tests to include common.filter, reducing the amount of boiler plate code (while still making the comment found on almost every test "get standard environment, filters and checks" accurate. Signed-off-by: Cleber Rosa Reviewed-by: Max Reitz --- tests/qemu-iotests/001 | 1 - tests/qemu-iotests/002 | 1 - tests/qemu-iotests/003 | 1 - tests/qemu-iotests/004 | 1 - tests/qemu-iotests/005 | 1 - tests/qemu-iotests/007 | 1 - tests/qemu-iotests/008 | 1 - tests/qemu-iotests/009 | 1 - tests/qemu-iotests/010 | 1 - tests/qemu-iotests/011 | 1 - tests/qemu-iotests/012 | 1 - tests/qemu-iotests/013 | 1 - tests/qemu-iotests/014 | 1 - tests/qemu-iotests/015 | 1 - tests/qemu-iotests/017 | 1 - tests/qemu-iotests/018 | 1 - tests/qemu-iotests/019 | 1 - tests/qemu-iotests/020 | 1 - tests/qemu-iotests/021 | 1 - tests/qemu-iotests/022 | 1 - tests/qemu-iotests/023 | 1 - tests/qemu-iotests/024 | 1 - tests/qemu-iotests/025 | 1 - tests/qemu-iotests/026 | 1 - tests/qemu-iotests/027 | 1 - tests/qemu-iotests/028 | 1 - tests/qemu-iotests/029 | 1 - tests/qemu-iotests/031 | 1 - tests/qemu-iotests/032 | 1 - tests/qemu-iotests/033 | 1 - tests/qemu-iotests/034 | 1 - tests/qemu-iotests/035 | 1 - tests/qemu-iotests/036 | 1 - tests/qemu-iotests/037 | 1 - tests/qemu-iotests/038 | 1 - tests/qemu-iotests/039 | 1 - tests/qemu-iotests/042 | 1 - tests/qemu-iotests/043 | 1 - tests/qemu-iotests/046 | 1 - tests/qemu-iotests/047 | 1 - tests/qemu-iotests/048 | 1 - tests/qemu-iotests/049 | 1 - tests/qemu-iotests/050 | 1 - tests/qemu-iotests/051 | 1 - tests/qemu-iotests/052 | 1 - tests/qemu-iotests/053 | 1 - tests/qemu-iotests/054 | 1 - tests/qemu-iotests/058 | 1 - tests/qemu-iotests/059 | 1 - tests/qemu-iotests/060 | 1 - tests/qemu-iotests/061 | 1 - tests/qemu-iotests/062 | 1 - tests/qemu-iotests/063 | 1 - tests/qemu-iotests/064 | 1 - tests/qemu-iotests/066 | 1 - tests/qemu-iotests/067 | 1 - tests/qemu-iotests/068 | 1 - tests/qemu-iotests/069 | 1 - tests/qemu-iotests/070 | 1 - tests/qemu-iotests/071 | 1 - tests/qemu-iotests/072 | 1 - tests/qemu-iotests/073 | 1 - tests/qemu-iotests/074 | 1 - tests/qemu-iotests/075 | 1 - tests/qemu-iotests/076 | 1 - tests/qemu-iotests/077 | 1 - tests/qemu-iotests/078 | 1 - tests/qemu-iotests/079 | 1 - tests/qemu-iotests/080 | 1 - tests/qemu-iotests/081 | 1 - tests/qemu-iotests/082 | 1 - tests/qemu-iotests/083 | 1 - tests/qemu-iotests/084 | 1 - tests/qemu-iotests/085 | 1 - tests/qemu-iotests/086 | 1 - tests/qemu-iotests/087 | 1 - tests/qemu-iotests/088 | 1 - tests/qemu-iotests/089 | 1 - tests/qemu-iotests/090 | 1 - tests/qemu-iotests/091 | 1 - tests/qemu-iotests/092 | 1 - tests/qemu-iotests/094 | 1 - tests/qemu-iotests/095 | 1 - tests/qemu-iotests/097 | 1 - tests/qemu-iotests/098 | 1 - tests/qemu-iotests/099 | 1 - tests/qemu-iotests/101 | 1 - tests/qemu-iotests/102 | 1 - tests/qemu-iotests/103 | 1 - tests/qemu-iotests/104 | 1 - tests/qemu-iotests/105 | 1 - tests/qemu-iotests/106 | 1 - tests/qemu-iotests/107 | 1 - tests/qemu-iotests/108 | 1 - tests/qemu-iotests/109 | 1 - tests/qemu-iotests/110 | 1 - tests/qemu-iotests/111 | 1 - tests/qemu-iotests/112 | 1 - tests/qemu-iotests/113 | 1 - tests/qemu-iotests/114 | 1 - tests/qemu-iotests/115 | 1 - tests/qemu-iotests/116 | 1 - tests/qemu-iotests/117 | 1 - tests/qemu-iotests/119 | 1 - tests/qemu-iotests/120 | 1 - tests/qemu-iotests/121 | 1 - tests/qemu-iotests/122 | 1 - tests/qemu-iotests/123 | 1 - tests/qemu-iotests/125 | 1 - tests/qemu-iotests/126 | 1 - tests/qemu-iotests/127 | 1 - tests/qemu-iotests/128 | 1 - tests/qemu-iotests/130 | 1 - tests/qemu-iotests/131 | 1 - tests/qemu-iotests/133 | 1 - tests/qemu-iotests/135 | 1 - tests/qemu-iotests/137 | 1 - tests/qemu-iotests/138 | 1 - tests/qemu-iotests/140 | 1 - tests/qemu-iotests/141 | 1 - tests/qemu-iotests/142 | 1 - tests/qemu-iotests/143 | 1 - tests/qemu-iotests/144 | 1 - tests/qemu-iotests/145 | 1 - tests/qemu-iotests/146 | 1 - tests/qemu-iotests/150 | 1 - tests/qemu-iotests/153 | 1 - tests/qemu-iotests/154 | 1 - tests/qemu-iotests/156 | 1 - tests/qemu-iotests/157 | 1 - tests/qemu-iotests/158 | 1 - tests/qemu-iotests/159 | 1 - tests/qemu-iotests/160 | 1 - tests/qemu-iotests/162 | 1 - tests/qemu-iotests/170 | 1 - tests/qemu-iotests/171 | 1 - tests/qemu-iotests/172 | 1 - tests/qemu-iotests/173 | 1 - tests/qemu-iotests/174 | 1 - tests/qemu-iotests/175 | 1 - tests/qemu-iotests/176 | 1 - tests/qemu-iotests/177 | 1 - tests/qemu-iotests/178 | 1 - tests/qemu-iotests/179 | 1 - tests/qemu-iotests/181 | 1 - tests/qemu-iotests/182 | 1 - tests/qemu-iotests/183 | 1 - tests/qemu-iotests/184 | 1 - tests/qemu-iotests/185 | 1 - tests/qemu-iotests/186 | 1 - tests/qemu-iotests/187 | 1 - tests/qemu-iotests/188 | 1 - tests/qemu-iotests/189 | 1 - tests/qemu-iotests/190 | 1 - tests/qemu-iotests/191 | 1 - tests/qemu-iotests/192 | 1 - tests/qemu-iotests/195 | 1 - tests/qemu-iotests/197 | 1 - tests/qemu-iotests/common.rc | 7 +++++++ 159 files changed, 7 insertions(+), 158 deletions(-) diff --git a/tests/qemu-iotests/001 b/tests/qemu-iotests/001 index ffd14e2ce9..f93298a0e1 100755 --- a/tests/qemu-iotests/001 +++ b/tests/qemu-iotests/001 @@ -35,7 +35,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 _supported_fmt generic _supported_proto generic diff --git a/tests/qemu-iotests/002 b/tests/qemu-iotests/002 index d4f8e91b91..750d8d6498 100755 --- a/tests/qemu-iotests/002 +++ b/tests/qemu-iotests/002 @@ -35,7 +35,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 _supported_fmt generic _supported_proto generic diff --git a/tests/qemu-iotests/003 b/tests/qemu-iotests/003 index 19889b9fcd..29618f040c 100755 --- a/tests/qemu-iotests/003 +++ b/tests/qemu-iotests/003 @@ -35,7 +35,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 _supported_fmt generic _supported_proto generic diff --git a/tests/qemu-iotests/004 b/tests/qemu-iotests/004 index 6f2aa3d9a2..a8b98b5464 100755 --- a/tests/qemu-iotests/004 +++ b/tests/qemu-iotests/004 @@ -35,7 +35,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 _supported_fmt raw qcow qcow2 qed vdi vmdk vhdx luks _supported_proto generic diff --git a/tests/qemu-iotests/005 b/tests/qemu-iotests/005 index 444737751f..f514ac8979 100755 --- a/tests/qemu-iotests/005 +++ b/tests/qemu-iotests/005 @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 _supported_fmt generic _supported_proto generic diff --git a/tests/qemu-iotests/007 b/tests/qemu-iotests/007 index fa543eeb7d..1e1dff6cef 100755 --- a/tests/qemu-iotests/007 +++ b/tests/qemu-iotests/007 @@ -36,7 +36,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 # currently only qcow2 allows for consistency checks using qemu-img _supported_fmt qcow2 diff --git a/tests/qemu-iotests/008 b/tests/qemu-iotests/008 index 8e89d74fe9..dce57adc3a 100755 --- a/tests/qemu-iotests/008 +++ b/tests/qemu-iotests/008 @@ -35,7 +35,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 _supported_fmt generic _supported_proto generic diff --git a/tests/qemu-iotests/009 b/tests/qemu-iotests/009 index 16e4475ca4..8ae55ec3f5 100755 --- a/tests/qemu-iotests/009 +++ b/tests/qemu-iotests/009 @@ -35,7 +35,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 _supported_fmt generic _supported_proto generic diff --git a/tests/qemu-iotests/010 b/tests/qemu-iotests/010 index 151dac238d..b74d96dfcd 100755 --- a/tests/qemu-iotests/010 +++ b/tests/qemu-iotests/010 @@ -35,7 +35,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 _supported_fmt generic _supported_proto generic diff --git a/tests/qemu-iotests/011 b/tests/qemu-iotests/011 index f8d044ec85..3a87df8cf0 100755 --- a/tests/qemu-iotests/011 +++ b/tests/qemu-iotests/011 @@ -35,7 +35,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 _supported_fmt generic _supported_proto generic diff --git a/tests/qemu-iotests/012 b/tests/qemu-iotests/012 index 01a770d59c..d646d0dec5 100755 --- a/tests/qemu-iotests/012 +++ b/tests/qemu-iotests/012 @@ -37,7 +37,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 _supported_fmt generic _supported_proto file diff --git a/tests/qemu-iotests/013 b/tests/qemu-iotests/013 index d013f87da9..b46493358e 100755 --- a/tests/qemu-iotests/013 +++ b/tests/qemu-iotests/013 @@ -35,7 +35,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter . ./common.pattern =20 # much of this could be generic for any format supporting compression. diff --git a/tests/qemu-iotests/014 b/tests/qemu-iotests/014 index 2ea79e8c8b..a7c912e913 100755 --- a/tests/qemu-iotests/014 +++ b/tests/qemu-iotests/014 @@ -37,7 +37,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter . ./common.pattern =20 # much of this could be generic for any format supporting snapshots diff --git a/tests/qemu-iotests/015 b/tests/qemu-iotests/015 index aaf9c3f415..1a685ec927 100755 --- a/tests/qemu-iotests/015 +++ b/tests/qemu-iotests/015 @@ -36,7 +36,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 # actually any format that supports snapshots _supported_fmt qcow2 diff --git a/tests/qemu-iotests/017 b/tests/qemu-iotests/017 index 4f9302db42..0ef6b9a04e 100755 --- a/tests/qemu-iotests/017 +++ b/tests/qemu-iotests/017 @@ -35,7 +35,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter . ./common.pattern =20 # Any format supporting backing files diff --git a/tests/qemu-iotests/018 b/tests/qemu-iotests/018 index 1d39d35c47..315aad6663 100755 --- a/tests/qemu-iotests/018 +++ b/tests/qemu-iotests/018 @@ -35,7 +35,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter . ./common.pattern =20 # Any format supporting backing files diff --git a/tests/qemu-iotests/019 b/tests/qemu-iotests/019 index 24a789a25c..e25fa6309f 100755 --- a/tests/qemu-iotests/019 +++ b/tests/qemu-iotests/019 @@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter . ./common.pattern =20 # Any format supporting backing files diff --git a/tests/qemu-iotests/020 b/tests/qemu-iotests/020 index 7a111100ec..18bc6fc48d 100755 --- a/tests/qemu-iotests/020 +++ b/tests/qemu-iotests/020 @@ -37,7 +37,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter . ./common.pattern =20 # Any format supporting backing files diff --git a/tests/qemu-iotests/021 b/tests/qemu-iotests/021 index 11e8ed7187..391afccea5 100755 --- a/tests/qemu-iotests/021 +++ b/tests/qemu-iotests/021 @@ -35,7 +35,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 _supported_fmt generic _supported_proto generic diff --git a/tests/qemu-iotests/022 b/tests/qemu-iotests/022 index 2452a9f86a..c165f1aa2c 100755 --- a/tests/qemu-iotests/022 +++ b/tests/qemu-iotests/022 @@ -37,7 +37,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter . ./common.pattern =20 # Any format that supports snapshots diff --git a/tests/qemu-iotests/023 b/tests/qemu-iotests/023 index 497ae1ed17..54713838c1 100755 --- a/tests/qemu-iotests/023 +++ b/tests/qemu-iotests/023 @@ -35,7 +35,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter . ./common.pattern =20 # much of this could be generic for any format supporting compression. diff --git a/tests/qemu-iotests/024 b/tests/qemu-iotests/024 index e0d77ce2f5..63a50322dc 100755 --- a/tests/qemu-iotests/024 +++ b/tests/qemu-iotests/024 @@ -37,7 +37,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter . ./common.pattern =20 # Currently only qcow2 and qed support rebasing diff --git a/tests/qemu-iotests/025 b/tests/qemu-iotests/025 index f5e672e6b3..f0d57aff94 100755 --- a/tests/qemu-iotests/025 +++ b/tests/qemu-iotests/025 @@ -35,7 +35,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter . ./common.pattern =20 _supported_fmt raw qcow2 qed diff --git a/tests/qemu-iotests/026 b/tests/qemu-iotests/026 index 7fadfbace5..5a97803f0c 100755 --- a/tests/qemu-iotests/026 +++ b/tests/qemu-iotests/026 @@ -36,7 +36,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter . ./common.pattern =20 # Currently only qcow2 supports rebasing diff --git a/tests/qemu-iotests/027 b/tests/qemu-iotests/027 index 08593da775..d6d47ab6b4 100755 --- a/tests/qemu-iotests/027 +++ b/tests/qemu-iotests/027 @@ -35,7 +35,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 _supported_fmt vmdk qcow qcow2 qed _supported_proto generic diff --git a/tests/qemu-iotests/028 b/tests/qemu-iotests/028 index 97a8869251..ee3adf64c1 100755 --- a/tests/qemu-iotests/028 +++ b/tests/qemu-iotests/028 @@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter . ./common.pattern . ./common.qemu =20 diff --git a/tests/qemu-iotests/029 b/tests/qemu-iotests/029 index 30bab24dc0..7f47b50dc6 100755 --- a/tests/qemu-iotests/029 +++ b/tests/qemu-iotests/029 @@ -36,7 +36,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter . ./common.pattern =20 # Any format supporting intenal snapshots diff --git a/tests/qemu-iotests/031 b/tests/qemu-iotests/031 index 1e08abc5ed..03a1699d2d 100755 --- a/tests/qemu-iotests/031 +++ b/tests/qemu-iotests/031 @@ -35,7 +35,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter . ./common.pattern =20 # This tests qcow2-specific low-level functionality diff --git a/tests/qemu-iotests/032 b/tests/qemu-iotests/032 index 24bcb52fc2..f2339e8a75 100755 --- a/tests/qemu-iotests/032 +++ b/tests/qemu-iotests/032 @@ -37,7 +37,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter . ./common.pattern =20 # This works for any image format (though unlikely to segfault for raw) diff --git a/tests/qemu-iotests/033 b/tests/qemu-iotests/033 index 2cdfd1397a..3bf5325630 100755 --- a/tests/qemu-iotests/033 +++ b/tests/qemu-iotests/033 @@ -35,7 +35,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 _supported_fmt generic _supported_proto generic diff --git a/tests/qemu-iotests/034 b/tests/qemu-iotests/034 index 1b28bdae63..1459ff5b9d 100755 --- a/tests/qemu-iotests/034 +++ b/tests/qemu-iotests/034 @@ -35,7 +35,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 _supported_fmt qcow qcow2 vmdk qed _supported_proto file diff --git a/tests/qemu-iotests/035 b/tests/qemu-iotests/035 index efc38e4d49..53f0f3fe6a 100755 --- a/tests/qemu-iotests/035 +++ b/tests/qemu-iotests/035 @@ -36,7 +36,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 _supported_fmt qcow2 _supported_proto generic diff --git a/tests/qemu-iotests/036 b/tests/qemu-iotests/036 index ce638d6076..f9560e9771 100755 --- a/tests/qemu-iotests/036 +++ b/tests/qemu-iotests/036 @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter . ./common.pattern =20 # This tests qcow2-specific low-level functionality diff --git a/tests/qemu-iotests/037 b/tests/qemu-iotests/037 index c476b823d2..383e770d57 100755 --- a/tests/qemu-iotests/037 +++ b/tests/qemu-iotests/037 @@ -35,7 +35,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 _supported_fmt qcow qcow2 vmdk qed _supported_proto file diff --git a/tests/qemu-iotests/038 b/tests/qemu-iotests/038 index d99a1501d7..b0d4510cdf 100755 --- a/tests/qemu-iotests/038 +++ b/tests/qemu-iotests/038 @@ -35,7 +35,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 _supported_fmt qcow2 qed _supported_proto file diff --git a/tests/qemu-iotests/039 b/tests/qemu-iotests/039 index 1f48339692..d5e6205528 100755 --- a/tests/qemu-iotests/039 +++ b/tests/qemu-iotests/039 @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 _supported_fmt qcow2 _supported_proto file diff --git a/tests/qemu-iotests/042 b/tests/qemu-iotests/042 index a53e7cb757..bccc01f8ed 100755 --- a/tests/qemu-iotests/042 +++ b/tests/qemu-iotests/042 @@ -35,7 +35,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 _supported_fmt qcow2 qed _supported_proto file diff --git a/tests/qemu-iotests/043 b/tests/qemu-iotests/043 index 1c6c22d92a..c650054328 100755 --- a/tests/qemu-iotests/043 +++ b/tests/qemu-iotests/043 @@ -36,7 +36,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 # Any format supporting backing files _supported_fmt qcow2 qed diff --git a/tests/qemu-iotests/046 b/tests/qemu-iotests/046 index f2ebecf24c..e4c3c5364c 100755 --- a/tests/qemu-iotests/046 +++ b/tests/qemu-iotests/046 @@ -35,7 +35,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 _supported_fmt qcow2 _supported_proto file diff --git a/tests/qemu-iotests/047 b/tests/qemu-iotests/047 index 1b8f3d4a64..e941a6f110 100755 --- a/tests/qemu-iotests/047 +++ b/tests/qemu-iotests/047 @@ -36,7 +36,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 _supported_fmt qcow2 _supported_proto generic diff --git a/tests/qemu-iotests/048 b/tests/qemu-iotests/048 index 9ed04a068d..5b77c195b8 100755 --- a/tests/qemu-iotests/048 +++ b/tests/qemu-iotests/048 @@ -43,7 +43,6 @@ _compare() =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter . ./common.pattern =20 _supported_fmt raw qcow2 qed luks diff --git a/tests/qemu-iotests/049 b/tests/qemu-iotests/049 index df35b6d21e..70f02d3f41 100755 --- a/tests/qemu-iotests/049 +++ b/tests/qemu-iotests/049 @@ -35,7 +35,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 _supported_fmt qcow2 _supported_proto file diff --git a/tests/qemu-iotests/050 b/tests/qemu-iotests/050 index 03b4a5d620..c7a2858cea 100755 --- a/tests/qemu-iotests/050 +++ b/tests/qemu-iotests/050 @@ -37,7 +37,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 _supported_fmt qcow2 qed _supported_proto file diff --git a/tests/qemu-iotests/051 b/tests/qemu-iotests/051 index dba8816c9f..2f3eca42ec 100755 --- a/tests/qemu-iotests/051 +++ b/tests/qemu-iotests/051 @@ -35,7 +35,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 _supported_fmt qcow2 _supported_proto file diff --git a/tests/qemu-iotests/052 b/tests/qemu-iotests/052 index 842eaced3b..612dff2d8d 100755 --- a/tests/qemu-iotests/052 +++ b/tests/qemu-iotests/052 @@ -35,7 +35,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 _supported_fmt generic _supported_proto file diff --git a/tests/qemu-iotests/053 b/tests/qemu-iotests/053 index 2a04f5f551..6f7667bfd9 100755 --- a/tests/qemu-iotests/053 +++ b/tests/qemu-iotests/053 @@ -36,7 +36,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 _supported_fmt qcow2 qcow _supported_proto file diff --git a/tests/qemu-iotests/054 b/tests/qemu-iotests/054 index bf47ef9fac..a2c7632158 100755 --- a/tests/qemu-iotests/054 +++ b/tests/qemu-iotests/054 @@ -35,7 +35,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 _supported_fmt qcow2 _supported_proto file diff --git a/tests/qemu-iotests/058 b/tests/qemu-iotests/058 index 5eb8784669..08f8bd5d6b 100755 --- a/tests/qemu-iotests/058 +++ b/tests/qemu-iotests/058 @@ -85,7 +85,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter . ./common.pattern =20 _supported_fmt qcow2 diff --git a/tests/qemu-iotests/059 b/tests/qemu-iotests/059 index a1c34eeb7c..19f09eca35 100755 --- a/tests/qemu-iotests/059 +++ b/tests/qemu-iotests/059 @@ -36,7 +36,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 # This tests vmdk-specific low-level functionality _supported_fmt vmdk diff --git a/tests/qemu-iotests/060 b/tests/qemu-iotests/060 index fae08b03bf..ab25c85019 100755 --- a/tests/qemu-iotests/060 +++ b/tests/qemu-iotests/060 @@ -35,7 +35,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 # This tests qocw2-specific low-level functionality _supported_fmt qcow2 diff --git a/tests/qemu-iotests/061 b/tests/qemu-iotests/061 index f5678b10c9..266e0515d7 100755 --- a/tests/qemu-iotests/061 +++ b/tests/qemu-iotests/061 @@ -35,7 +35,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 # This tests qocw2-specific low-level functionality _supported_fmt qcow2 diff --git a/tests/qemu-iotests/062 b/tests/qemu-iotests/062 index 051fb9f410..1eaafdff0f 100755 --- a/tests/qemu-iotests/062 +++ b/tests/qemu-iotests/062 @@ -36,7 +36,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 # This tests qocw2-specific low-level functionality _supported_fmt qcow2 diff --git a/tests/qemu-iotests/063 b/tests/qemu-iotests/063 index e4f6ea9385..968b624be5 100755 --- a/tests/qemu-iotests/063 +++ b/tests/qemu-iotests/063 @@ -37,7 +37,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter . ./common.pattern =20 _supported_fmt qcow qcow2 vmdk qed raw diff --git a/tests/qemu-iotests/064 b/tests/qemu-iotests/064 index 5792fbbc92..9d62b0bf94 100755 --- a/tests/qemu-iotests/064 +++ b/tests/qemu-iotests/064 @@ -35,7 +35,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 _supported_fmt vhdx _supported_proto generic diff --git a/tests/qemu-iotests/066 b/tests/qemu-iotests/066 index 8638217736..8841354cd8 100755 --- a/tests/qemu-iotests/066 +++ b/tests/qemu-iotests/066 @@ -35,7 +35,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 # This tests qocw2-specific low-level functionality _supported_fmt qcow2 diff --git a/tests/qemu-iotests/067 b/tests/qemu-iotests/067 index 9d561ef786..cbc3180af0 100755 --- a/tests/qemu-iotests/067 +++ b/tests/qemu-iotests/067 @@ -29,7 +29,6 @@ status=3D1 # failure is the default! =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 _supported_fmt qcow2 _supported_proto file diff --git a/tests/qemu-iotests/068 b/tests/qemu-iotests/068 index e7fca6a494..ce33795dda 100755 --- a/tests/qemu-iotests/068 +++ b/tests/qemu-iotests/068 @@ -35,7 +35,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 # This tests qocw2-specific low-level functionality _supported_fmt qcow2 diff --git a/tests/qemu-iotests/069 b/tests/qemu-iotests/069 index 96e55ef216..5cdf0c1e47 100755 --- a/tests/qemu-iotests/069 +++ b/tests/qemu-iotests/069 @@ -35,7 +35,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 _supported_fmt qed qcow qcow2 vmdk _supported_proto file diff --git a/tests/qemu-iotests/070 b/tests/qemu-iotests/070 index 8d08d74ff9..60c4b74a5e 100755 --- a/tests/qemu-iotests/070 +++ b/tests/qemu-iotests/070 @@ -36,7 +36,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 _supported_fmt vhdx _supported_proto generic diff --git a/tests/qemu-iotests/071 b/tests/qemu-iotests/071 index 48b495513f..802b2b9da2 100755 --- a/tests/qemu-iotests/071 +++ b/tests/qemu-iotests/071 @@ -35,7 +35,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 _supported_fmt qcow2 _supported_proto file diff --git a/tests/qemu-iotests/072 b/tests/qemu-iotests/072 index aa027c7d29..0851a72239 100755 --- a/tests/qemu-iotests/072 +++ b/tests/qemu-iotests/072 @@ -35,7 +35,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 _supported_fmt vpc vmdk vhdx vdi qed qcow2 qcow _supported_proto file diff --git a/tests/qemu-iotests/073 b/tests/qemu-iotests/073 index 40f85b18b9..e1982454b0 100755 --- a/tests/qemu-iotests/073 +++ b/tests/qemu-iotests/073 @@ -35,7 +35,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 _supported_fmt qcow2 _supported_proto generic diff --git a/tests/qemu-iotests/074 b/tests/qemu-iotests/074 index b17866bd34..4ba59ba1d7 100755 --- a/tests/qemu-iotests/074 +++ b/tests/qemu-iotests/074 @@ -44,7 +44,6 @@ _compare() =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter . ./common.pattern =20 _supported_fmt qcow2 diff --git a/tests/qemu-iotests/075 b/tests/qemu-iotests/075 index 770d51c6cb..8d6179f847 100755 --- a/tests/qemu-iotests/075 +++ b/tests/qemu-iotests/075 @@ -35,7 +35,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 _supported_fmt cloop _supported_proto file diff --git a/tests/qemu-iotests/076 b/tests/qemu-iotests/076 index ef9e6a4ff3..fb5da1fd17 100755 --- a/tests/qemu-iotests/076 +++ b/tests/qemu-iotests/076 @@ -35,7 +35,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 _supported_fmt parallels _supported_proto file diff --git a/tests/qemu-iotests/077 b/tests/qemu-iotests/077 index b3c6fb1370..ec30895982 100755 --- a/tests/qemu-iotests/077 +++ b/tests/qemu-iotests/077 @@ -35,7 +35,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 _supported_fmt raw _supported_proto generic diff --git a/tests/qemu-iotests/078 b/tests/qemu-iotests/078 index f333e9ac84..74ab4ee259 100755 --- a/tests/qemu-iotests/078 +++ b/tests/qemu-iotests/078 @@ -35,7 +35,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 _supported_fmt bochs _supported_proto file diff --git a/tests/qemu-iotests/079 b/tests/qemu-iotests/079 index b2e3f7426a..9c368991d1 100755 --- a/tests/qemu-iotests/079 +++ b/tests/qemu-iotests/079 @@ -35,7 +35,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 _supported_fmt qcow2 _supported_proto file nfs diff --git a/tests/qemu-iotests/080 b/tests/qemu-iotests/080 index 55044c700b..4667ca229b 100755 --- a/tests/qemu-iotests/080 +++ b/tests/qemu-iotests/080 @@ -36,7 +36,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 _supported_fmt qcow2 _supported_proto file diff --git a/tests/qemu-iotests/081 b/tests/qemu-iotests/081 index da3fb0984b..b067348fb2 100755 --- a/tests/qemu-iotests/081 +++ b/tests/qemu-iotests/081 @@ -37,7 +37,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 _supported_fmt raw _supported_proto file diff --git a/tests/qemu-iotests/082 b/tests/qemu-iotests/082 index d5c83d45ed..7167632e67 100755 --- a/tests/qemu-iotests/082 +++ b/tests/qemu-iotests/082 @@ -35,7 +35,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 _supported_fmt qcow2 _supported_proto file nfs diff --git a/tests/qemu-iotests/083 b/tests/qemu-iotests/083 index 3c1adbf0fb..b724b6bf14 100755 --- a/tests/qemu-iotests/083 +++ b/tests/qemu-iotests/083 @@ -37,7 +37,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 _supported_fmt generic _supported_proto nbd diff --git a/tests/qemu-iotests/084 b/tests/qemu-iotests/084 index 04f2aa9d7d..9bfa2e57e6 100755 --- a/tests/qemu-iotests/084 +++ b/tests/qemu-iotests/084 @@ -36,7 +36,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 # This tests vdi-specific header fields _supported_fmt vdi diff --git a/tests/qemu-iotests/085 b/tests/qemu-iotests/085 index 5c7668cf9b..1b330c28ca 100755 --- a/tests/qemu-iotests/085 +++ b/tests/qemu-iotests/085 @@ -52,7 +52,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter . ./common.qemu =20 _supported_fmt qcow2 diff --git a/tests/qemu-iotests/086 b/tests/qemu-iotests/086 index cd4494a660..859e80a291 100755 --- a/tests/qemu-iotests/086 +++ b/tests/qemu-iotests/086 @@ -35,7 +35,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 _supported_fmt qcow2 raw _supported_proto file nfs diff --git a/tests/qemu-iotests/087 b/tests/qemu-iotests/087 index 27ab6c5151..3e29e5f9fe 100755 --- a/tests/qemu-iotests/087 +++ b/tests/qemu-iotests/087 @@ -29,7 +29,6 @@ status=3D1 # failure is the default! =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 _supported_fmt qcow2 _supported_proto file diff --git a/tests/qemu-iotests/088 b/tests/qemu-iotests/088 index b8076f216b..2a51616be8 100755 --- a/tests/qemu-iotests/088 +++ b/tests/qemu-iotests/088 @@ -36,7 +36,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 _supported_fmt vpc _supported_proto file diff --git a/tests/qemu-iotests/089 b/tests/qemu-iotests/089 index 9bfe2307b3..70aef90ca7 100755 --- a/tests/qemu-iotests/089 +++ b/tests/qemu-iotests/089 @@ -35,7 +35,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 _supported_fmt qcow2 _supported_proto file diff --git a/tests/qemu-iotests/090 b/tests/qemu-iotests/090 index 7380503d57..8b141e1043 100755 --- a/tests/qemu-iotests/090 +++ b/tests/qemu-iotests/090 @@ -35,7 +35,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 _supported_fmt qcow2 _supported_proto file nfs diff --git a/tests/qemu-iotests/091 b/tests/qemu-iotests/091 index 10ac4a8d73..447514af51 100755 --- a/tests/qemu-iotests/091 +++ b/tests/qemu-iotests/091 @@ -41,7 +41,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter . ./common.qemu =20 _supported_fmt qcow2 diff --git a/tests/qemu-iotests/092 b/tests/qemu-iotests/092 index 5bbdd071d8..f11b6747b3 100755 --- a/tests/qemu-iotests/092 +++ b/tests/qemu-iotests/092 @@ -36,7 +36,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 _supported_fmt qcow _supported_proto file diff --git a/tests/qemu-iotests/094 b/tests/qemu-iotests/094 index 9aa01e3627..ba14a11ade 100755 --- a/tests/qemu-iotests/094 +++ b/tests/qemu-iotests/094 @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter . ./common.qemu =20 _supported_fmt generic diff --git a/tests/qemu-iotests/095 b/tests/qemu-iotests/095 index 030adb22e1..c35dc42cd6 100755 --- a/tests/qemu-iotests/095 +++ b/tests/qemu-iotests/095 @@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter . ./common.qemu =20 _supported_fmt qcow2 diff --git a/tests/qemu-iotests/097 b/tests/qemu-iotests/097 index e22670c8d0..788393e0c6 100755 --- a/tests/qemu-iotests/097 +++ b/tests/qemu-iotests/097 @@ -37,7 +37,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter . ./common.pattern =20 # Any format supporting backing files and bdrv_make_empty diff --git a/tests/qemu-iotests/098 b/tests/qemu-iotests/098 index b002e969b3..92b1e75817 100755 --- a/tests/qemu-iotests/098 +++ b/tests/qemu-iotests/098 @@ -36,7 +36,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter . ./common.pattern =20 _supported_fmt qcow2 diff --git a/tests/qemu-iotests/099 b/tests/qemu-iotests/099 index caaf58eee5..d103e53ea0 100755 --- a/tests/qemu-iotests/099 +++ b/tests/qemu-iotests/099 @@ -36,7 +36,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 # Basically all formats, but "raw" has issues with _filter_imgfmt regardin= g the # raw comparison image for blkverify; also, all images have to support cre= ation diff --git a/tests/qemu-iotests/101 b/tests/qemu-iotests/101 index ea53f8b8d3..806da17830 100755 --- a/tests/qemu-iotests/101 +++ b/tests/qemu-iotests/101 @@ -35,7 +35,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 _supported_fmt raw _supported_proto file diff --git a/tests/qemu-iotests/102 b/tests/qemu-iotests/102 index d7ad8d9840..cdf714412a 100755 --- a/tests/qemu-iotests/102 +++ b/tests/qemu-iotests/102 @@ -36,7 +36,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and qemu instance handling . ./common.rc -. ./common.filter . ./common.qemu =20 _supported_fmt qcow2 diff --git a/tests/qemu-iotests/103 b/tests/qemu-iotests/103 index ecbd8ebd71..5326c6e338 100755 --- a/tests/qemu-iotests/103 +++ b/tests/qemu-iotests/103 @@ -35,7 +35,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 _supported_fmt qcow2 _supported_proto file nfs diff --git a/tests/qemu-iotests/104 b/tests/qemu-iotests/104 index 726d467052..869f6c5c09 100755 --- a/tests/qemu-iotests/104 +++ b/tests/qemu-iotests/104 @@ -31,7 +31,6 @@ trap "exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 _supported_fmt raw qcow qcow2 qed vdi vmdk vhdx _supported_proto generic diff --git a/tests/qemu-iotests/105 b/tests/qemu-iotests/105 index 3db4ce3cf3..6436a275da 100755 --- a/tests/qemu-iotests/105 +++ b/tests/qemu-iotests/105 @@ -35,7 +35,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 _supported_fmt qcow2 vmdk vhdx qed _supported_proto generic diff --git a/tests/qemu-iotests/106 b/tests/qemu-iotests/106 index bfe71f4e60..0a7b803e12 100755 --- a/tests/qemu-iotests/106 +++ b/tests/qemu-iotests/106 @@ -35,7 +35,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment and filters . ./common.rc -. ./common.filter =20 _supported_fmt raw _supported_proto file diff --git a/tests/qemu-iotests/107 b/tests/qemu-iotests/107 index d7222dc1c9..f111c3c6fc 100755 --- a/tests/qemu-iotests/107 +++ b/tests/qemu-iotests/107 @@ -35,7 +35,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 _supported_fmt qcow2 _supported_proto file nfs diff --git a/tests/qemu-iotests/108 b/tests/qemu-iotests/108 index 2355d98c1d..95bb252fd2 100755 --- a/tests/qemu-iotests/108 +++ b/tests/qemu-iotests/108 @@ -36,7 +36,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 # This tests qocw2-specific low-level functionality _supported_fmt qcow2 diff --git a/tests/qemu-iotests/109 b/tests/qemu-iotests/109 index d70b574d88..d9b1a344df 100755 --- a/tests/qemu-iotests/109 +++ b/tests/qemu-iotests/109 @@ -37,7 +37,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter . ./common.qemu =20 _supported_fmt raw diff --git a/tests/qemu-iotests/110 b/tests/qemu-iotests/110 index 9de7369f3a..4de36a4d6d 100755 --- a/tests/qemu-iotests/110 +++ b/tests/qemu-iotests/110 @@ -35,7 +35,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 # Any format supporting backing files _supported_fmt qed qcow qcow2 vmdk diff --git a/tests/qemu-iotests/111 b/tests/qemu-iotests/111 index a1c152d0c1..d41dacd948 100755 --- a/tests/qemu-iotests/111 +++ b/tests/qemu-iotests/111 @@ -36,7 +36,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 _supported_fmt qed qcow qcow2 vmdk _supported_proto file diff --git a/tests/qemu-iotests/112 b/tests/qemu-iotests/112 index 28eb9aae93..f8a6a1b888 100755 --- a/tests/qemu-iotests/112 +++ b/tests/qemu-iotests/112 @@ -35,7 +35,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 # This tests qcow2-specific low-level functionality _supported_fmt qcow2 diff --git a/tests/qemu-iotests/113 b/tests/qemu-iotests/113 index 19b68b2727..c4a176fcf1 100755 --- a/tests/qemu-iotests/113 +++ b/tests/qemu-iotests/113 @@ -36,7 +36,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 # We can only test one format here because we need its sample file _supported_fmt bochs diff --git a/tests/qemu-iotests/114 b/tests/qemu-iotests/114 index 5b7dc5496c..c9fd36ec54 100755 --- a/tests/qemu-iotests/114 +++ b/tests/qemu-iotests/114 @@ -35,7 +35,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 _supported_fmt qcow2 _supported_proto generic diff --git a/tests/qemu-iotests/115 b/tests/qemu-iotests/115 index 665c2ead41..26f550c661 100755 --- a/tests/qemu-iotests/115 +++ b/tests/qemu-iotests/115 @@ -35,7 +35,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 _supported_fmt qcow2 _supported_proto file diff --git a/tests/qemu-iotests/116 b/tests/qemu-iotests/116 index df0172fed3..1995906cc8 100755 --- a/tests/qemu-iotests/116 +++ b/tests/qemu-iotests/116 @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 _supported_fmt qed _supported_proto generic diff --git a/tests/qemu-iotests/117 b/tests/qemu-iotests/117 index 6c83461182..205e8842a0 100755 --- a/tests/qemu-iotests/117 +++ b/tests/qemu-iotests/117 @@ -36,7 +36,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter . ./common.qemu =20 _supported_fmt qcow2 diff --git a/tests/qemu-iotests/119 b/tests/qemu-iotests/119 index 4f34fb4343..bdbdfe0f33 100755 --- a/tests/qemu-iotests/119 +++ b/tests/qemu-iotests/119 @@ -36,7 +36,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 _supported_fmt raw _supported_proto nbd diff --git a/tests/qemu-iotests/120 b/tests/qemu-iotests/120 index f40b97d099..5227278899 100755 --- a/tests/qemu-iotests/120 +++ b/tests/qemu-iotests/120 @@ -36,7 +36,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 _supported_fmt generic _supported_proto file diff --git a/tests/qemu-iotests/121 b/tests/qemu-iotests/121 index 1307b4e327..1b50dc858c 100755 --- a/tests/qemu-iotests/121 +++ b/tests/qemu-iotests/121 @@ -35,7 +35,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 _supported_fmt qcow2 _supported_proto file diff --git a/tests/qemu-iotests/122 b/tests/qemu-iotests/122 index 45b359c2ba..b583d44952 100755 --- a/tests/qemu-iotests/122 +++ b/tests/qemu-iotests/122 @@ -36,7 +36,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 _supported_fmt qcow2 _supported_proto file diff --git a/tests/qemu-iotests/123 b/tests/qemu-iotests/123 index b18e3fca9a..d2e170666e 100755 --- a/tests/qemu-iotests/123 +++ b/tests/qemu-iotests/123 @@ -36,7 +36,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 _supported_fmt raw _supported_proto nbd diff --git a/tests/qemu-iotests/125 b/tests/qemu-iotests/125 index c20c71570c..03ff104639 100755 --- a/tests/qemu-iotests/125 +++ b/tests/qemu-iotests/125 @@ -41,7 +41,6 @@ get_image_size_on_host() =20 # get standard environment and filters . ./common.rc -. ./common.filter =20 _supported_fmt qcow2 _supported_proto file diff --git a/tests/qemu-iotests/126 b/tests/qemu-iotests/126 index a2d4d6c73d..f3058e046a 100755 --- a/tests/qemu-iotests/126 +++ b/tests/qemu-iotests/126 @@ -30,7 +30,6 @@ status=3D1 # failure is the default! =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 # Needs backing file support _supported_fmt qcow qcow2 qed vmdk diff --git a/tests/qemu-iotests/127 b/tests/qemu-iotests/127 index 9e0d7d3be8..ea2679e969 100755 --- a/tests/qemu-iotests/127 +++ b/tests/qemu-iotests/127 @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and qemu instance handling . ./common.rc -. ./common.filter . ./common.qemu =20 _supported_fmt qcow2 diff --git a/tests/qemu-iotests/128 b/tests/qemu-iotests/128 index 0976a18133..934b6e7e33 100755 --- a/tests/qemu-iotests/128 +++ b/tests/qemu-iotests/128 @@ -67,7 +67,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 _supported_fmt raw _supported_proto file diff --git a/tests/qemu-iotests/130 b/tests/qemu-iotests/130 index e7e43de6d6..c0f5782003 100755 --- a/tests/qemu-iotests/130 +++ b/tests/qemu-iotests/130 @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter . ./common.qemu =20 _supported_fmt qcow2 diff --git a/tests/qemu-iotests/131 b/tests/qemu-iotests/131 index 94a9ae76af..142b908981 100755 --- a/tests/qemu-iotests/131 +++ b/tests/qemu-iotests/131 @@ -35,7 +35,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 _supported_fmt parallels _supported_proto file diff --git a/tests/qemu-iotests/133 b/tests/qemu-iotests/133 index 9d35a6a1ca..467c31e58d 100755 --- a/tests/qemu-iotests/133 +++ b/tests/qemu-iotests/133 @@ -35,7 +35,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 _supported_fmt qcow2 _supported_proto file diff --git a/tests/qemu-iotests/135 b/tests/qemu-iotests/135 index ce608312f6..5f77ad5885 100755 --- a/tests/qemu-iotests/135 +++ b/tests/qemu-iotests/135 @@ -35,7 +35,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 _supported_fmt vpc _supported_proto generic diff --git a/tests/qemu-iotests/137 b/tests/qemu-iotests/137 index eb91e517d7..1e12b140ae 100755 --- a/tests/qemu-iotests/137 +++ b/tests/qemu-iotests/137 @@ -35,7 +35,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter . ./common.qemu =20 _supported_fmt qcow2 diff --git a/tests/qemu-iotests/138 b/tests/qemu-iotests/138 index 21650d8197..33570ad20d 100755 --- a/tests/qemu-iotests/138 +++ b/tests/qemu-iotests/138 @@ -35,7 +35,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 # This tests qocw2-specific low-level functionality _supported_fmt qcow2 diff --git a/tests/qemu-iotests/140 b/tests/qemu-iotests/140 index a8fc95145c..32af253b41 100755 --- a/tests/qemu-iotests/140 +++ b/tests/qemu-iotests/140 @@ -41,7 +41,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter . ./common.qemu =20 _supported_fmt generic diff --git a/tests/qemu-iotests/141 b/tests/qemu-iotests/141 index 2f9d7b9bc2..f9914a91da 100755 --- a/tests/qemu-iotests/141 +++ b/tests/qemu-iotests/141 @@ -37,7 +37,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter . ./common.qemu =20 # Needs backing file and backing format support diff --git a/tests/qemu-iotests/142 b/tests/qemu-iotests/142 index 1639c83985..030269b951 100755 --- a/tests/qemu-iotests/142 +++ b/tests/qemu-iotests/142 @@ -36,7 +36,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 _supported_fmt qcow2 _supported_proto file diff --git a/tests/qemu-iotests/143 b/tests/qemu-iotests/143 index 5ff1944507..2e4acfa580 100755 --- a/tests/qemu-iotests/143 +++ b/tests/qemu-iotests/143 @@ -36,7 +36,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter . ./common.qemu =20 _supported_fmt generic diff --git a/tests/qemu-iotests/144 b/tests/qemu-iotests/144 index 00de3c33cf..5879fd86a1 100755 --- a/tests/qemu-iotests/144 +++ b/tests/qemu-iotests/144 @@ -42,7 +42,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter . ./common.qemu =20 _supported_fmt qcow2 diff --git a/tests/qemu-iotests/145 b/tests/qemu-iotests/145 index c371b3c46a..6e6181c858 100755 --- a/tests/qemu-iotests/145 +++ b/tests/qemu-iotests/145 @@ -36,7 +36,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 _supported_fmt generic _supported_proto generic diff --git a/tests/qemu-iotests/146 b/tests/qemu-iotests/146 index 043711be68..bdc875d143 100755 --- a/tests/qemu-iotests/146 +++ b/tests/qemu-iotests/146 @@ -36,7 +36,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter . ./common.qemu =20 _supported_fmt vpc diff --git a/tests/qemu-iotests/150 b/tests/qemu-iotests/150 index ee8f6375f6..182cf41597 100755 --- a/tests/qemu-iotests/150 +++ b/tests/qemu-iotests/150 @@ -35,7 +35,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 _supported_fmt raw qcow2 _supported_proto file diff --git a/tests/qemu-iotests/153 b/tests/qemu-iotests/153 index fa25eb24bd..6d93726108 100755 --- a/tests/qemu-iotests/153 +++ b/tests/qemu-iotests/153 @@ -42,7 +42,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter . ./common.qemu =20 size=3D32M diff --git a/tests/qemu-iotests/154 b/tests/qemu-iotests/154 index fde03b0dc8..2dcbed329d 100755 --- a/tests/qemu-iotests/154 +++ b/tests/qemu-iotests/154 @@ -35,7 +35,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 _supported_fmt qcow2 _supported_proto file diff --git a/tests/qemu-iotests/156 b/tests/qemu-iotests/156 index e75dc4d743..02c52c7ec6 100755 --- a/tests/qemu-iotests/156 +++ b/tests/qemu-iotests/156 @@ -44,7 +44,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter . ./common.qemu =20 _supported_fmt qcow2 qed diff --git a/tests/qemu-iotests/157 b/tests/qemu-iotests/157 index 2bf02be465..1f273856fd 100755 --- a/tests/qemu-iotests/157 +++ b/tests/qemu-iotests/157 @@ -35,7 +35,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 _supported_fmt generic _supported_proto file diff --git a/tests/qemu-iotests/158 b/tests/qemu-iotests/158 index 24ac600a4a..22a17f92cb 100755 --- a/tests/qemu-iotests/158 +++ b/tests/qemu-iotests/158 @@ -35,7 +35,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 _supported_fmt qcow qcow2 _supported_proto generic diff --git a/tests/qemu-iotests/159 b/tests/qemu-iotests/159 index 9b0e1ecc90..250905c264 100755 --- a/tests/qemu-iotests/159 +++ b/tests/qemu-iotests/159 @@ -34,7 +34,6 @@ _cleanup() trap "_cleanup; exit \$status" 0 1 2 3 15 =20 . ./common.rc -. ./common.filter . ./common.pattern =20 _supported_fmt generic diff --git a/tests/qemu-iotests/160 b/tests/qemu-iotests/160 index 5c910e5bfc..7ec68d712e 100755 --- a/tests/qemu-iotests/160 +++ b/tests/qemu-iotests/160 @@ -34,7 +34,6 @@ _cleanup() trap "_cleanup; exit \$status" 0 1 2 3 15 =20 . ./common.rc -. ./common.filter . ./common.pattern =20 _supported_fmt raw diff --git a/tests/qemu-iotests/162 b/tests/qemu-iotests/162 index 477a806360..0572e91c9a 100755 --- a/tests/qemu-iotests/162 +++ b/tests/qemu-iotests/162 @@ -37,7 +37,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 _supported_fmt generic _supported_os Linux diff --git a/tests/qemu-iotests/170 b/tests/qemu-iotests/170 index b79359fc4e..2f76d43101 100755 --- a/tests/qemu-iotests/170 +++ b/tests/qemu-iotests/170 @@ -34,7 +34,6 @@ _cleanup() trap "_cleanup; exit \$status" 0 1 2 3 15 =20 . ./common.rc -. ./common.filter . ./common.pattern =20 _supported_fmt generic diff --git a/tests/qemu-iotests/171 b/tests/qemu-iotests/171 index bcfaaf1be2..d703cae210 100755 --- a/tests/qemu-iotests/171 +++ b/tests/qemu-iotests/171 @@ -36,7 +36,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 _supported_fmt raw _supported_proto file diff --git a/tests/qemu-iotests/172 b/tests/qemu-iotests/172 index 02c5f79bab..9da3d60146 100755 --- a/tests/qemu-iotests/172 +++ b/tests/qemu-iotests/172 @@ -37,7 +37,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 _supported_fmt qcow2 _supported_proto file diff --git a/tests/qemu-iotests/173 b/tests/qemu-iotests/173 index bdaa092979..ef1ed9cdd1 100755 --- a/tests/qemu-iotests/173 +++ b/tests/qemu-iotests/173 @@ -37,7 +37,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter . ./common.qemu =20 _supported_fmt qcow2 diff --git a/tests/qemu-iotests/174 b/tests/qemu-iotests/174 index 552879db32..a5a4ef65fb 100755 --- a/tests/qemu-iotests/174 +++ b/tests/qemu-iotests/174 @@ -35,7 +35,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 _unsupported_fmt raw =20 diff --git a/tests/qemu-iotests/175 b/tests/qemu-iotests/175 index ca56e827cd..4e270ce41e 100755 --- a/tests/qemu-iotests/175 +++ b/tests/qemu-iotests/175 @@ -35,7 +35,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 _supported_fmt raw _supported_proto file diff --git a/tests/qemu-iotests/176 b/tests/qemu-iotests/176 index 950b28720e..d2f53acb1d 100755 --- a/tests/qemu-iotests/176 +++ b/tests/qemu-iotests/176 @@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter . ./common.pattern =20 # Any format supporting backing files and bdrv_make_empty diff --git a/tests/qemu-iotests/177 b/tests/qemu-iotests/177 index 28990977f1..b3ef552103 100755 --- a/tests/qemu-iotests/177 +++ b/tests/qemu-iotests/177 @@ -35,7 +35,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 _supported_fmt qcow2 _supported_proto file diff --git a/tests/qemu-iotests/178 b/tests/qemu-iotests/178 index 6af52c653a..b5df4f5cc2 100755 --- a/tests/qemu-iotests/178 +++ b/tests/qemu-iotests/178 @@ -36,7 +36,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter . ./common.pattern =20 _supported_fmt raw qcow2 diff --git a/tests/qemu-iotests/179 b/tests/qemu-iotests/179 index 115944a753..7a68986536 100755 --- a/tests/qemu-iotests/179 +++ b/tests/qemu-iotests/179 @@ -36,7 +36,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 _supported_fmt qcow2 _supported_proto file diff --git a/tests/qemu-iotests/181 b/tests/qemu-iotests/181 index 0c91e8f9de..51b597fc13 100755 --- a/tests/qemu-iotests/181 +++ b/tests/qemu-iotests/181 @@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter . ./common.qemu =20 _supported_fmt generic diff --git a/tests/qemu-iotests/182 b/tests/qemu-iotests/182 index 2e078ceed8..7293d50bcb 100755 --- a/tests/qemu-iotests/182 +++ b/tests/qemu-iotests/182 @@ -36,7 +36,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter . ./common.qemu =20 _supported_fmt qcow2 diff --git a/tests/qemu-iotests/183 b/tests/qemu-iotests/183 index 20268ff7a1..ead98f3a4f 100755 --- a/tests/qemu-iotests/183 +++ b/tests/qemu-iotests/183 @@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter . ./common.qemu =20 _supported_fmt qcow2 raw qed dmg quorum diff --git a/tests/qemu-iotests/184 b/tests/qemu-iotests/184 index ee96c99af3..487e854272 100755 --- a/tests/qemu-iotests/184 +++ b/tests/qemu-iotests/184 @@ -35,7 +35,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 _supported_fmt qcow2 _supported_proto file diff --git a/tests/qemu-iotests/185 b/tests/qemu-iotests/185 index f5b47e4c1a..fab1d54af0 100755 --- a/tests/qemu-iotests/185 +++ b/tests/qemu-iotests/185 @@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter . ./common.qemu =20 _supported_fmt qcow2 diff --git a/tests/qemu-iotests/186 b/tests/qemu-iotests/186 index 44cc01ed87..fcf9204801 100755 --- a/tests/qemu-iotests/186 +++ b/tests/qemu-iotests/186 @@ -35,7 +35,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 _supported_fmt qcow2 _supported_proto file diff --git a/tests/qemu-iotests/187 b/tests/qemu-iotests/187 index 7bb783363c..dfd1da9469 100755 --- a/tests/qemu-iotests/187 +++ b/tests/qemu-iotests/187 @@ -37,7 +37,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 _supported_fmt qcow2 _supported_proto file diff --git a/tests/qemu-iotests/188 b/tests/qemu-iotests/188 index 83ed03e33e..481e77dc17 100755 --- a/tests/qemu-iotests/188 +++ b/tests/qemu-iotests/188 @@ -35,7 +35,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 _supported_fmt qcow2 _supported_proto generic diff --git a/tests/qemu-iotests/189 b/tests/qemu-iotests/189 index e695475722..6ab55b618a 100755 --- a/tests/qemu-iotests/189 +++ b/tests/qemu-iotests/189 @@ -35,7 +35,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 _supported_fmt qcow2 _supported_proto generic diff --git a/tests/qemu-iotests/190 b/tests/qemu-iotests/190 index 8f808fef5d..179949bd3b 100755 --- a/tests/qemu-iotests/190 +++ b/tests/qemu-iotests/190 @@ -36,7 +36,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter . ./common.pattern =20 # See 178 for more extensive tests across more formats diff --git a/tests/qemu-iotests/191 b/tests/qemu-iotests/191 index ad785e10b1..ce6284a05e 100755 --- a/tests/qemu-iotests/191 +++ b/tests/qemu-iotests/191 @@ -41,7 +41,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter . ./common.qemu =20 _supported_fmt qcow2 diff --git a/tests/qemu-iotests/192 b/tests/qemu-iotests/192 index 595f0d786a..4d0776432a 100755 --- a/tests/qemu-iotests/192 +++ b/tests/qemu-iotests/192 @@ -36,7 +36,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter . ./common.qemu =20 _supported_fmt generic diff --git a/tests/qemu-iotests/195 b/tests/qemu-iotests/195 index e7a403ded2..810054a085 100755 --- a/tests/qemu-iotests/195 +++ b/tests/qemu-iotests/195 @@ -36,7 +36,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 _supported_fmt qcow2 _supported_proto file diff --git a/tests/qemu-iotests/197 b/tests/qemu-iotests/197 index 887eb4f496..0f7361611f 100755 --- a/tests/qemu-iotests/197 +++ b/tests/qemu-iotests/197 @@ -29,7 +29,6 @@ status=3D1 # failure is the default! =20 # get standard environment, filters and checks . ./common.rc -. ./common.filter =20 TEST_WRAP=3D"$TEST_DIR/t.wrap.qcow2" BLKDBG_CONF=3D"$TEST_DIR/blkdebug.conf" diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc index dcabe4c7cc..9a40e0e98f 100644 --- a/tests/qemu-iotests/common.rc +++ b/tests/qemu-iotests/common.rc @@ -190,6 +190,13 @@ _use_sample_img() fi } =20 + +if ! . ./common.filter + then + echo "$0: failed to source common.filter" + exit 1 +fi + _make_test_img() { # extra qemu-img options can be added by tests --=20 2.13.6 From nobody Sat May 4 14:04:10 2024 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; 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 1510854443349287.3854176602383; Thu, 16 Nov 2017 09:47:23 -0800 (PST) Received: from localhost ([::1]:42189 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eFOFy-000668-5M for importer@patchew.org; Thu, 16 Nov 2017 12:47:18 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60026) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eFO7x-0007sG-LL for qemu-devel@nongnu.org; Thu, 16 Nov 2017 12:39:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eFO7o-0003vd-8K for qemu-devel@nongnu.org; Thu, 16 Nov 2017 12:39:01 -0500 Received: from mx1.redhat.com ([209.132.183.28]:53208) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eFO7Q-0002tg-JD; Thu, 16 Nov 2017 12:38:29 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id ABF38C04AC5D; Thu, 16 Nov 2017 17:38:27 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-120-124.rdu2.redhat.com [10.10.120.124]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D487B60602; Thu, 16 Nov 2017 17:38:26 +0000 (UTC) From: Cleber Rosa To: qemu-devel@nongnu.org Date: Thu, 16 Nov 2017 12:38:05 -0500 Message-Id: <20171116173810.16457-6-crosa@redhat.com> In-Reply-To: <20171116173810.16457-1-crosa@redhat.com> References: <20171116173810.16457-1-crosa@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Thu, 16 Nov 2017 17:38:27 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 05/10] qemu-iotests: define functions used in _cleanup() before its use 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: Kevin Wolf , Cleber Rosa , qemu-block@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The functions used in _cleanup() come from common.rc, which currently gets sourced after _cleanup() is defined and registered as a signal handler. When _cleanup() is executed, it has no valid references to those functions, as BASH won't resolve the reference at that time. While at it, also fix some tabs versus spaces indentation in _cleanup() in a few tests. Signed-off-by: Cleber Rosa Reviewed-by: Eric Blake --- tests/qemu-iotests/001 | 6 +++--- tests/qemu-iotests/002 | 6 +++--- tests/qemu-iotests/003 | 6 +++--- tests/qemu-iotests/004 | 6 +++--- tests/qemu-iotests/005 | 6 +++--- tests/qemu-iotests/007 | 6 +++--- tests/qemu-iotests/008 | 6 +++--- tests/qemu-iotests/009 | 6 +++--- tests/qemu-iotests/010 | 6 +++--- tests/qemu-iotests/011 | 6 +++--- tests/qemu-iotests/012 | 6 +++--- tests/qemu-iotests/013 | 8 ++++---- tests/qemu-iotests/014 | 8 ++++---- tests/qemu-iotests/015 | 6 +++--- tests/qemu-iotests/017 | 8 ++++---- tests/qemu-iotests/018 | 8 ++++---- tests/qemu-iotests/019 | 8 ++++---- tests/qemu-iotests/020 | 8 ++++---- tests/qemu-iotests/021 | 6 +++--- tests/qemu-iotests/022 | 8 ++++---- tests/qemu-iotests/023 | 8 ++++---- tests/qemu-iotests/024 | 8 ++++---- tests/qemu-iotests/025 | 8 ++++---- tests/qemu-iotests/026 | 8 ++++---- tests/qemu-iotests/027 | 6 +++--- tests/qemu-iotests/028 | 10 +++++----- tests/qemu-iotests/029 | 8 ++++---- tests/qemu-iotests/031 | 8 ++++---- tests/qemu-iotests/032 | 8 ++++---- tests/qemu-iotests/033 | 6 +++--- tests/qemu-iotests/034 | 6 +++--- tests/qemu-iotests/035 | 6 +++--- tests/qemu-iotests/036 | 8 ++++---- tests/qemu-iotests/037 | 6 +++--- tests/qemu-iotests/038 | 6 +++--- tests/qemu-iotests/039 | 6 +++--- tests/qemu-iotests/042 | 6 +++--- tests/qemu-iotests/043 | 6 +++--- tests/qemu-iotests/046 | 6 +++--- tests/qemu-iotests/047 | 6 +++--- tests/qemu-iotests/048 | 8 ++++---- tests/qemu-iotests/049 | 6 +++--- tests/qemu-iotests/050 | 6 +++--- tests/qemu-iotests/051 | 6 +++--- tests/qemu-iotests/052 | 6 +++--- tests/qemu-iotests/053 | 6 +++--- tests/qemu-iotests/054 | 6 +++--- tests/qemu-iotests/058 | 8 ++++---- tests/qemu-iotests/059 | 6 +++--- tests/qemu-iotests/060 | 6 +++--- tests/qemu-iotests/061 | 6 +++--- tests/qemu-iotests/062 | 6 +++--- tests/qemu-iotests/063 | 8 ++++---- tests/qemu-iotests/064 | 6 +++--- tests/qemu-iotests/066 | 6 +++--- tests/qemu-iotests/068 | 6 +++--- tests/qemu-iotests/069 | 6 +++--- tests/qemu-iotests/070 | 6 +++--- tests/qemu-iotests/071 | 6 +++--- tests/qemu-iotests/072 | 6 +++--- tests/qemu-iotests/073 | 6 +++--- tests/qemu-iotests/074 | 8 ++++---- tests/qemu-iotests/075 | 6 +++--- tests/qemu-iotests/076 | 6 +++--- tests/qemu-iotests/077 | 6 +++--- tests/qemu-iotests/078 | 6 +++--- tests/qemu-iotests/079 | 6 +++--- tests/qemu-iotests/080 | 6 +++--- tests/qemu-iotests/082 | 6 +++--- tests/qemu-iotests/084 | 6 +++--- tests/qemu-iotests/085 | 8 ++++---- tests/qemu-iotests/086 | 6 +++--- tests/qemu-iotests/088 | 6 +++--- tests/qemu-iotests/089 | 6 +++--- tests/qemu-iotests/090 | 6 +++--- tests/qemu-iotests/091 | 8 ++++---- tests/qemu-iotests/092 | 6 +++--- tests/qemu-iotests/094 | 9 ++++----- tests/qemu-iotests/095 | 8 ++++---- tests/qemu-iotests/097 | 8 ++++---- tests/qemu-iotests/098 | 8 ++++---- tests/qemu-iotests/099 | 6 +++--- tests/qemu-iotests/101 | 6 +++--- tests/qemu-iotests/102 | 8 ++++---- tests/qemu-iotests/103 | 6 +++--- tests/qemu-iotests/105 | 6 +++--- tests/qemu-iotests/106 | 6 +++--- tests/qemu-iotests/107 | 6 +++--- tests/qemu-iotests/108 | 6 +++--- tests/qemu-iotests/109 | 8 ++++---- tests/qemu-iotests/110 | 6 +++--- tests/qemu-iotests/111 | 6 +++--- tests/qemu-iotests/112 | 6 +++--- tests/qemu-iotests/113 | 6 +++--- tests/qemu-iotests/114 | 6 +++--- tests/qemu-iotests/115 | 6 +++--- tests/qemu-iotests/116 | 6 +++--- tests/qemu-iotests/117 | 10 +++++----- tests/qemu-iotests/119 | 6 +++--- tests/qemu-iotests/120 | 6 +++--- tests/qemu-iotests/121 | 6 +++--- tests/qemu-iotests/122 | 6 +++--- tests/qemu-iotests/123 | 6 +++--- tests/qemu-iotests/125 | 6 +++--- tests/qemu-iotests/127 | 8 ++++---- tests/qemu-iotests/130 | 8 ++++---- tests/qemu-iotests/131 | 6 +++--- tests/qemu-iotests/133 | 6 +++--- tests/qemu-iotests/134 | 8 ++++---- tests/qemu-iotests/135 | 6 +++--- tests/qemu-iotests/137 | 8 ++++---- tests/qemu-iotests/138 | 6 +++--- tests/qemu-iotests/140 | 8 ++++---- tests/qemu-iotests/141 | 8 ++++---- tests/qemu-iotests/142 | 6 +++--- tests/qemu-iotests/143 | 8 ++++---- tests/qemu-iotests/144 | 8 ++++---- tests/qemu-iotests/145 | 6 +++--- tests/qemu-iotests/146 | 8 ++++---- tests/qemu-iotests/150 | 6 +++--- tests/qemu-iotests/153 | 8 ++++---- tests/qemu-iotests/154 | 6 +++--- tests/qemu-iotests/156 | 8 ++++---- tests/qemu-iotests/157 | 6 +++--- tests/qemu-iotests/158 | 6 +++--- tests/qemu-iotests/159 | 6 +++--- tests/qemu-iotests/160 | 6 +++--- tests/qemu-iotests/170 | 6 +++--- tests/qemu-iotests/171 | 6 +++--- tests/qemu-iotests/172 | 8 ++++---- tests/qemu-iotests/173 | 8 ++++---- tests/qemu-iotests/174 | 6 +++--- tests/qemu-iotests/175 | 6 +++--- tests/qemu-iotests/176 | 8 ++++---- tests/qemu-iotests/177 | 6 +++--- tests/qemu-iotests/178 | 8 ++++---- tests/qemu-iotests/179 | 8 ++++---- tests/qemu-iotests/181 | 10 +++++----- tests/qemu-iotests/182 | 8 ++++---- tests/qemu-iotests/183 | 8 ++++---- tests/qemu-iotests/184 | 6 +++--- tests/qemu-iotests/185 | 8 ++++---- tests/qemu-iotests/186 | 6 +++--- tests/qemu-iotests/187 | 8 ++++---- tests/qemu-iotests/188 | 6 +++--- tests/qemu-iotests/189 | 6 +++--- tests/qemu-iotests/190 | 8 ++++---- tests/qemu-iotests/191 | 8 ++++---- tests/qemu-iotests/192 | 8 ++++---- tests/qemu-iotests/195 | 6 +++--- 150 files changed, 506 insertions(+), 507 deletions(-) diff --git a/tests/qemu-iotests/001 b/tests/qemu-iotests/001 index f93298a0e1..22d82e4be8 100755 --- a/tests/qemu-iotests/001 +++ b/tests/qemu-iotests/001 @@ -27,15 +27,15 @@ echo "QA output created by $seq" here=3D`pwd` status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc + _cleanup() { _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc - _supported_fmt generic _supported_proto generic _supported_os Linux diff --git a/tests/qemu-iotests/002 b/tests/qemu-iotests/002 index 750d8d6498..6fd7183974 100755 --- a/tests/qemu-iotests/002 +++ b/tests/qemu-iotests/002 @@ -27,15 +27,15 @@ echo "QA output created by $seq" here=3D`pwd` status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc + _cleanup() { _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc - _supported_fmt generic _supported_proto generic _supported_os Linux diff --git a/tests/qemu-iotests/003 b/tests/qemu-iotests/003 index 29618f040c..acad5a2a4d 100755 --- a/tests/qemu-iotests/003 +++ b/tests/qemu-iotests/003 @@ -27,15 +27,15 @@ echo "QA output created by $seq" here=3D`pwd` status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc + _cleanup() { _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc - _supported_fmt generic _supported_proto generic _supported_os Linux diff --git a/tests/qemu-iotests/004 b/tests/qemu-iotests/004 index a8b98b5464..954a46ef7b 100755 --- a/tests/qemu-iotests/004 +++ b/tests/qemu-iotests/004 @@ -27,15 +27,15 @@ echo "QA output created by $seq" here=3D`pwd` status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc + _cleanup() { _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc - _supported_fmt raw qcow qcow2 qed vdi vmdk vhdx luks _supported_proto generic _supported_os Linux diff --git a/tests/qemu-iotests/005 b/tests/qemu-iotests/005 index f514ac8979..f77caab3eb 100755 --- a/tests/qemu-iotests/005 +++ b/tests/qemu-iotests/005 @@ -30,15 +30,15 @@ echo "QA output created by $seq" here=3D`pwd` status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc + _cleanup() { _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc - _supported_fmt generic _supported_proto generic _supported_os Linux diff --git a/tests/qemu-iotests/007 b/tests/qemu-iotests/007 index 1e1dff6cef..b0bd1e1520 100755 --- a/tests/qemu-iotests/007 +++ b/tests/qemu-iotests/007 @@ -27,6 +27,9 @@ echo "QA output created by $seq" here=3D`pwd` status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc + _cleanup() { _cleanup_test_img @@ -34,9 +37,6 @@ _cleanup() } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc - # currently only qcow2 allows for consistency checks using qemu-img _supported_fmt qcow2 _supported_proto generic diff --git a/tests/qemu-iotests/008 b/tests/qemu-iotests/008 index dce57adc3a..7ab1a403f1 100755 --- a/tests/qemu-iotests/008 +++ b/tests/qemu-iotests/008 @@ -27,15 +27,15 @@ echo "QA output created by $seq" here=3D`pwd` status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc + _cleanup() { _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc - _supported_fmt generic _supported_proto generic _supported_os Linux diff --git a/tests/qemu-iotests/009 b/tests/qemu-iotests/009 index 8ae55ec3f5..aeaed1d782 100755 --- a/tests/qemu-iotests/009 +++ b/tests/qemu-iotests/009 @@ -27,15 +27,15 @@ echo "QA output created by $seq" here=3D`pwd` status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc + _cleanup() { _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc - _supported_fmt generic _supported_proto generic _supported_os Linux diff --git a/tests/qemu-iotests/010 b/tests/qemu-iotests/010 index b74d96dfcd..ce3e939796 100755 --- a/tests/qemu-iotests/010 +++ b/tests/qemu-iotests/010 @@ -27,15 +27,15 @@ echo "QA output created by $seq" here=3D`pwd` status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc + _cleanup() { _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc - _supported_fmt generic _supported_proto generic _supported_os Linux diff --git a/tests/qemu-iotests/011 b/tests/qemu-iotests/011 index 3a87df8cf0..8c98c9510e 100755 --- a/tests/qemu-iotests/011 +++ b/tests/qemu-iotests/011 @@ -27,15 +27,15 @@ echo "QA output created by $seq" here=3D`pwd` status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc + _cleanup() { _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc - _supported_fmt generic _supported_proto generic _supported_os Linux diff --git a/tests/qemu-iotests/012 b/tests/qemu-iotests/012 index d646d0dec5..484b47a9d3 100755 --- a/tests/qemu-iotests/012 +++ b/tests/qemu-iotests/012 @@ -29,15 +29,15 @@ echo "QA output created by $seq" here=3D`pwd` status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc + _cleanup() { _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc - _supported_fmt generic _supported_proto file _supported_os Linux diff --git a/tests/qemu-iotests/013 b/tests/qemu-iotests/013 index b46493358e..afc4c5a2b0 100755 --- a/tests/qemu-iotests/013 +++ b/tests/qemu-iotests/013 @@ -27,16 +27,16 @@ echo "QA output created by $seq" here=3D`pwd` status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc +. ./common.pattern + _cleanup() { _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc -. ./common.pattern - # much of this could be generic for any format supporting compression. _supported_fmt qcow qcow2 _supported_proto file diff --git a/tests/qemu-iotests/014 b/tests/qemu-iotests/014 index a7c912e913..7307e10015 100755 --- a/tests/qemu-iotests/014 +++ b/tests/qemu-iotests/014 @@ -29,16 +29,16 @@ echo "QA output created by $seq" here=3D`pwd` status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc +. ./common.pattern + _cleanup() { _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc -. ./common.pattern - # much of this could be generic for any format supporting snapshots _supported_fmt qcow2 _supported_proto file diff --git a/tests/qemu-iotests/015 b/tests/qemu-iotests/015 index 1a685ec927..735f597dac 100755 --- a/tests/qemu-iotests/015 +++ b/tests/qemu-iotests/015 @@ -27,6 +27,9 @@ echo "QA output created by $seq" here=3D`pwd` status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc + _cleanup() { _cleanup_test_img @@ -34,9 +37,6 @@ _cleanup() } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc - # actually any format that supports snapshots _supported_fmt qcow2 _supported_proto generic diff --git a/tests/qemu-iotests/017 b/tests/qemu-iotests/017 index 0ef6b9a04e..765dee9157 100755 --- a/tests/qemu-iotests/017 +++ b/tests/qemu-iotests/017 @@ -27,16 +27,16 @@ echo "QA output created by $seq" here=3D`pwd` status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc +. ./common.pattern + _cleanup() { _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc -. ./common.pattern - # Any format supporting backing files _supported_fmt qcow qcow2 vmdk qed _supported_proto generic diff --git a/tests/qemu-iotests/018 b/tests/qemu-iotests/018 index 315aad6663..ae7907c1e9 100755 --- a/tests/qemu-iotests/018 +++ b/tests/qemu-iotests/018 @@ -27,16 +27,16 @@ echo "QA output created by $seq" here=3D`pwd` status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc +. ./common.pattern + _cleanup() { _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc -. ./common.pattern - # Any format supporting backing files _supported_fmt qcow qcow2 vmdk qed _supported_proto file diff --git a/tests/qemu-iotests/019 b/tests/qemu-iotests/019 index e25fa6309f..3b0e97feb9 100755 --- a/tests/qemu-iotests/019 +++ b/tests/qemu-iotests/019 @@ -29,6 +29,10 @@ echo "QA output created by $seq" here=3D`pwd` status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc +. ./common.pattern + _cleanup() { _cleanup_test_img @@ -37,10 +41,6 @@ _cleanup() } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc -. ./common.pattern - # Any format supporting backing files _supported_fmt qcow qcow2 vmdk qed _supported_proto file diff --git a/tests/qemu-iotests/020 b/tests/qemu-iotests/020 index 18bc6fc48d..a2bad2f04e 100755 --- a/tests/qemu-iotests/020 +++ b/tests/qemu-iotests/020 @@ -27,6 +27,10 @@ echo "QA output created by $seq" here=3D`pwd` status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc +. ./common.pattern + _cleanup() { _cleanup_test_img @@ -35,10 +39,6 @@ _cleanup() } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc -. ./common.pattern - # Any format supporting backing files _supported_fmt qcow qcow2 vmdk qed _supported_proto generic diff --git a/tests/qemu-iotests/021 b/tests/qemu-iotests/021 index 391afccea5..e34d50be52 100755 --- a/tests/qemu-iotests/021 +++ b/tests/qemu-iotests/021 @@ -27,15 +27,15 @@ echo "QA output created by $seq" here=3D`pwd` status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc + _cleanup() { _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc - _supported_fmt generic _supported_proto generic _supported_os Linux diff --git a/tests/qemu-iotests/022 b/tests/qemu-iotests/022 index c165f1aa2c..13c13e3e3e 100755 --- a/tests/qemu-iotests/022 +++ b/tests/qemu-iotests/022 @@ -29,16 +29,16 @@ echo "QA output created by $seq" here=3D`pwd` status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc +. ./common.pattern + _cleanup() { _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc -. ./common.pattern - # Any format that supports snapshots _supported_fmt qcow2 _supported_proto generic diff --git a/tests/qemu-iotests/023 b/tests/qemu-iotests/023 index 54713838c1..c7d64cf026 100755 --- a/tests/qemu-iotests/023 +++ b/tests/qemu-iotests/023 @@ -27,16 +27,16 @@ echo "QA output created by $seq" here=3D`pwd` status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc +. ./common.pattern + _cleanup() { _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc -. ./common.pattern - # much of this could be generic for any format supporting compression. _supported_fmt qcow qcow2 _supported_proto file diff --git a/tests/qemu-iotests/024 b/tests/qemu-iotests/024 index 63a50322dc..d2efc27aae 100755 --- a/tests/qemu-iotests/024 +++ b/tests/qemu-iotests/024 @@ -27,6 +27,10 @@ echo "QA output created by $seq" here=3D`pwd` status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc +. ./common.pattern + _cleanup() { _cleanup_test_img @@ -35,10 +39,6 @@ _cleanup() } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc -. ./common.pattern - # Currently only qcow2 and qed support rebasing _supported_fmt qcow2 qed _supported_proto file diff --git a/tests/qemu-iotests/025 b/tests/qemu-iotests/025 index f0d57aff94..afb5cf0ae0 100755 --- a/tests/qemu-iotests/025 +++ b/tests/qemu-iotests/025 @@ -27,16 +27,16 @@ echo "QA output created by $seq" here=3D`pwd` status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc +. ./common.pattern + _cleanup() { _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc -. ./common.pattern - _supported_fmt raw qcow2 qed _supported_proto file sheepdog rbd nfs _supported_os Linux diff --git a/tests/qemu-iotests/026 b/tests/qemu-iotests/026 index 5a97803f0c..a3be017ccb 100755 --- a/tests/qemu-iotests/026 +++ b/tests/qemu-iotests/026 @@ -27,6 +27,10 @@ echo "QA output created by $seq" here=3D`pwd` status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc +. ./common.pattern + _cleanup() { _cleanup_test_img @@ -34,10 +38,6 @@ _cleanup() } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc -. ./common.pattern - # Currently only qcow2 supports rebasing _supported_fmt qcow2 _supported_proto file diff --git a/tests/qemu-iotests/027 b/tests/qemu-iotests/027 index d6d47ab6b4..ea950e09d1 100755 --- a/tests/qemu-iotests/027 +++ b/tests/qemu-iotests/027 @@ -27,15 +27,15 @@ echo "QA output created by $seq" here=3D`pwd` status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc + _cleanup() { _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc - _supported_fmt vmdk qcow qcow2 qed _supported_proto generic _supported_os Linux diff --git a/tests/qemu-iotests/028 b/tests/qemu-iotests/028 index ee3adf64c1..0192004d84 100755 --- a/tests/qemu-iotests/028 +++ b/tests/qemu-iotests/028 @@ -30,6 +30,11 @@ echo "QA output created by $seq" here=3D`pwd` status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc +. ./common.pattern +. ./common.qemu + _cleanup() { _cleanup_qemu @@ -38,11 +43,6 @@ _cleanup() } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc -. ./common.pattern -. ./common.qemu - # Any format supporting backing files except vmdk and qcow which do not su= pport # smaller backing files. _supported_fmt qcow2 qed diff --git a/tests/qemu-iotests/029 b/tests/qemu-iotests/029 index 7f47b50dc6..d18d004e18 100755 --- a/tests/qemu-iotests/029 +++ b/tests/qemu-iotests/029 @@ -27,6 +27,10 @@ echo "QA output created by $seq" here=3D`pwd` status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc +. ./common.pattern + _cleanup() { rm -f $TEST_IMG.snap @@ -34,10 +38,6 @@ _cleanup() } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc -. ./common.pattern - # Any format supporting intenal snapshots _supported_fmt qcow2 _supported_proto generic diff --git a/tests/qemu-iotests/031 b/tests/qemu-iotests/031 index 03a1699d2d..b2aa016e00 100755 --- a/tests/qemu-iotests/031 +++ b/tests/qemu-iotests/031 @@ -27,16 +27,16 @@ echo "QA output created by $seq" here=3D`pwd` status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc +. ./common.pattern + _cleanup() { _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc -. ./common.pattern - # This tests qcow2-specific low-level functionality _supported_fmt qcow2 _supported_proto file diff --git a/tests/qemu-iotests/032 b/tests/qemu-iotests/032 index f2339e8a75..97404db0da 100755 --- a/tests/qemu-iotests/032 +++ b/tests/qemu-iotests/032 @@ -29,16 +29,16 @@ echo "QA output created by $seq" here=3D`pwd` status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc +. ./common.pattern + _cleanup() { _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc -. ./common.pattern - # This works for any image format (though unlikely to segfault for raw) _supported_fmt generic _supported_proto generic diff --git a/tests/qemu-iotests/033 b/tests/qemu-iotests/033 index 3bf5325630..1b9c3ba37a 100755 --- a/tests/qemu-iotests/033 +++ b/tests/qemu-iotests/033 @@ -27,15 +27,15 @@ echo "QA output created by $seq" here=3D`pwd` status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc + _cleanup() { _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc - _supported_fmt generic _supported_proto generic _supported_os Linux diff --git a/tests/qemu-iotests/034 b/tests/qemu-iotests/034 index 1459ff5b9d..8c9db83134 100755 --- a/tests/qemu-iotests/034 +++ b/tests/qemu-iotests/034 @@ -27,15 +27,15 @@ echo "QA output created by $seq" here=3D`pwd` status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc + _cleanup() { _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc - _supported_fmt qcow qcow2 vmdk qed _supported_proto file _supported_os Linux diff --git a/tests/qemu-iotests/035 b/tests/qemu-iotests/035 index 53f0f3fe6a..cead994725 100755 --- a/tests/qemu-iotests/035 +++ b/tests/qemu-iotests/035 @@ -28,15 +28,15 @@ echo "QA output created by $seq" here=3D`pwd` status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc + _cleanup() { _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc - _supported_fmt qcow2 _supported_proto generic _supported_os Linux diff --git a/tests/qemu-iotests/036 b/tests/qemu-iotests/036 index f9560e9771..07f3d30f77 100755 --- a/tests/qemu-iotests/036 +++ b/tests/qemu-iotests/036 @@ -30,16 +30,16 @@ echo "QA output created by $seq" here=3D`pwd` status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc +. ./common.pattern + _cleanup() { _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc -. ./common.pattern - # This tests qcow2-specific low-level functionality _supported_fmt qcow2 _supported_proto file diff --git a/tests/qemu-iotests/037 b/tests/qemu-iotests/037 index 383e770d57..510d113990 100755 --- a/tests/qemu-iotests/037 +++ b/tests/qemu-iotests/037 @@ -27,15 +27,15 @@ echo "QA output created by $seq" here=3D`pwd` status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc + _cleanup() { _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc - _supported_fmt qcow qcow2 vmdk qed _supported_proto file _supported_os Linux diff --git a/tests/qemu-iotests/038 b/tests/qemu-iotests/038 index b0d4510cdf..2286c081d6 100755 --- a/tests/qemu-iotests/038 +++ b/tests/qemu-iotests/038 @@ -27,15 +27,15 @@ echo "QA output created by $seq" here=3D`pwd` status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc + _cleanup() { _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc - _supported_fmt qcow2 qed _supported_proto file _supported_os Linux diff --git a/tests/qemu-iotests/039 b/tests/qemu-iotests/039 index d5e6205528..cc1e7d74db 100755 --- a/tests/qemu-iotests/039 +++ b/tests/qemu-iotests/039 @@ -30,15 +30,15 @@ echo "QA output created by $seq" here=3D`pwd` status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc + _cleanup() { _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc - _supported_fmt qcow2 _supported_proto file _supported_os Linux diff --git a/tests/qemu-iotests/042 b/tests/qemu-iotests/042 index bccc01f8ed..45d533b7d9 100755 --- a/tests/qemu-iotests/042 +++ b/tests/qemu-iotests/042 @@ -27,15 +27,15 @@ echo "QA output created by $seq" here=3D`pwd` status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc + _cleanup() { _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc - _supported_fmt qcow2 qed _supported_proto file _supported_os Linux diff --git a/tests/qemu-iotests/043 b/tests/qemu-iotests/043 index c650054328..b63073db37 100755 --- a/tests/qemu-iotests/043 +++ b/tests/qemu-iotests/043 @@ -27,6 +27,9 @@ echo "QA output created by $seq" here=3D`pwd` status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc + _cleanup() { _cleanup_test_img @@ -34,9 +37,6 @@ _cleanup() } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc - # Any format supporting backing files _supported_fmt qcow2 qed _supported_proto file diff --git a/tests/qemu-iotests/046 b/tests/qemu-iotests/046 index e4c3c5364c..09192b25de 100755 --- a/tests/qemu-iotests/046 +++ b/tests/qemu-iotests/046 @@ -27,15 +27,15 @@ echo "QA output created by $seq" here=3D`pwd` status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc + _cleanup() { _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc - _supported_fmt qcow2 _supported_proto file _supported_os Linux diff --git a/tests/qemu-iotests/047 b/tests/qemu-iotests/047 index e941a6f110..a11d212d44 100755 --- a/tests/qemu-iotests/047 +++ b/tests/qemu-iotests/047 @@ -28,15 +28,15 @@ echo "QA output created by $seq" here=3D`pwd` status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc + _cleanup() { _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc - _supported_fmt qcow2 _supported_proto generic _supported_os Linux diff --git a/tests/qemu-iotests/048 b/tests/qemu-iotests/048 index 5b77c195b8..f75cb4926e 100755 --- a/tests/qemu-iotests/048 +++ b/tests/qemu-iotests/048 @@ -27,6 +27,10 @@ echo "QA output created by $seq" =20 status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc +. ./common.pattern + _cleanup() { echo "Cleanup" @@ -41,10 +45,6 @@ _compare() echo $? } =20 -# get standard environment, filters and checks -. ./common.rc -. ./common.pattern - _supported_fmt raw qcow2 qed luks _supported_proto file _supported_os Linux diff --git a/tests/qemu-iotests/049 b/tests/qemu-iotests/049 index 70f02d3f41..20207a7023 100755 --- a/tests/qemu-iotests/049 +++ b/tests/qemu-iotests/049 @@ -27,15 +27,15 @@ echo "QA output created by $seq" here=3D`pwd` status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc + _cleanup() { _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc - _supported_fmt qcow2 _supported_proto file _supported_os Linux diff --git a/tests/qemu-iotests/050 b/tests/qemu-iotests/050 index c7a2858cea..9d22200910 100755 --- a/tests/qemu-iotests/050 +++ b/tests/qemu-iotests/050 @@ -27,6 +27,9 @@ echo "QA output created by $seq" here=3D`pwd` status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc + _cleanup() { _cleanup_test_img @@ -35,9 +38,6 @@ _cleanup() } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc - _supported_fmt qcow2 qed _supported_proto file _supported_os Linux diff --git a/tests/qemu-iotests/051 b/tests/qemu-iotests/051 index 2f3eca42ec..0ad210c560 100755 --- a/tests/qemu-iotests/051 +++ b/tests/qemu-iotests/051 @@ -27,15 +27,15 @@ echo "QA output created by $seq" here=3D`pwd` status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc + _cleanup() { _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc - _supported_fmt qcow2 _supported_proto file _supported_os Linux diff --git a/tests/qemu-iotests/052 b/tests/qemu-iotests/052 index 612dff2d8d..3355094e3e 100755 --- a/tests/qemu-iotests/052 +++ b/tests/qemu-iotests/052 @@ -27,15 +27,15 @@ echo "QA output created by $seq" here=3D`pwd` status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc + _cleanup() { _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc - _supported_fmt generic _supported_proto file _supported_os Linux diff --git a/tests/qemu-iotests/053 b/tests/qemu-iotests/053 index 6f7667bfd9..09e6a4f8bb 100755 --- a/tests/qemu-iotests/053 +++ b/tests/qemu-iotests/053 @@ -27,6 +27,9 @@ echo "QA output created by $seq" here=3D`pwd` status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc + _cleanup() { rm -f "$TEST_IMG.orig" @@ -34,9 +37,6 @@ _cleanup() } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc - _supported_fmt qcow2 qcow _supported_proto file _supported_os Linux diff --git a/tests/qemu-iotests/054 b/tests/qemu-iotests/054 index a2c7632158..46d0714881 100755 --- a/tests/qemu-iotests/054 +++ b/tests/qemu-iotests/054 @@ -27,15 +27,15 @@ echo "QA output created by $seq" here=3D`pwd` status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc + _cleanup() { _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc - _supported_fmt qcow2 _supported_proto file _supported_os Linux diff --git a/tests/qemu-iotests/058 b/tests/qemu-iotests/058 index 08f8bd5d6b..34dcd10a58 100755 --- a/tests/qemu-iotests/058 +++ b/tests/qemu-iotests/058 @@ -29,6 +29,10 @@ echo "QA output created by $seq" here=3D`pwd` status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc +. ./common.pattern + nbd_unix_socket=3D$TEST_DIR/test_qemu_nbd_socket nbd_snapshot_img=3D"nbd:unix:$nbd_unix_socket" rm -f "${TEST_DIR}/qemu-nbd.pid" @@ -83,10 +87,6 @@ _cleanup() } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc -. ./common.pattern - _supported_fmt qcow2 _supported_proto file _supported_os Linux diff --git a/tests/qemu-iotests/059 b/tests/qemu-iotests/059 index 19f09eca35..96883b78b9 100755 --- a/tests/qemu-iotests/059 +++ b/tests/qemu-iotests/059 @@ -27,6 +27,9 @@ echo "QA output created by $seq" here=3D`pwd` status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc + _cleanup() { _cleanup_test_img @@ -34,9 +37,6 @@ _cleanup() } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc - # This tests vmdk-specific low-level functionality _supported_fmt vmdk _supported_proto file diff --git a/tests/qemu-iotests/060 b/tests/qemu-iotests/060 index ab25c85019..5775ec2871 100755 --- a/tests/qemu-iotests/060 +++ b/tests/qemu-iotests/060 @@ -27,15 +27,15 @@ echo "QA output created by $seq" here=3D"$PWD" status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc + _cleanup() { _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc - # This tests qocw2-specific low-level functionality _supported_fmt qcow2 _supported_proto file diff --git a/tests/qemu-iotests/061 b/tests/qemu-iotests/061 index 266e0515d7..2097d64fe4 100755 --- a/tests/qemu-iotests/061 +++ b/tests/qemu-iotests/061 @@ -27,15 +27,15 @@ echo "QA output created by $seq" here=3D`pwd` status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc + _cleanup() { _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc - # This tests qocw2-specific low-level functionality _supported_fmt qcow2 _supported_proto file diff --git a/tests/qemu-iotests/062 b/tests/qemu-iotests/062 index 1eaafdff0f..6116453e30 100755 --- a/tests/qemu-iotests/062 +++ b/tests/qemu-iotests/062 @@ -28,15 +28,15 @@ echo "QA output created by $seq" here=3D`pwd` status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc + _cleanup() { _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc - # This tests qocw2-specific low-level functionality _supported_fmt qcow2 _supported_proto generic diff --git a/tests/qemu-iotests/063 b/tests/qemu-iotests/063 index 968b624be5..fbffd6d9e7 100755 --- a/tests/qemu-iotests/063 +++ b/tests/qemu-iotests/063 @@ -28,6 +28,10 @@ echo "QA output created by $seq" here=3D`pwd` status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc +. ./common.pattern + _cleanup() { _cleanup_test_img @@ -35,10 +39,6 @@ _cleanup() } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc -. ./common.pattern - _supported_fmt qcow qcow2 vmdk qed raw _supported_proto file _supported_os Linux diff --git a/tests/qemu-iotests/064 b/tests/qemu-iotests/064 index 9d62b0bf94..3bfb46146a 100755 --- a/tests/qemu-iotests/064 +++ b/tests/qemu-iotests/064 @@ -27,15 +27,15 @@ echo "QA output created by $seq" here=3D`pwd` status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc + _cleanup() { _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc - _supported_fmt vhdx _supported_proto generic _supported_os Linux diff --git a/tests/qemu-iotests/066 b/tests/qemu-iotests/066 index 8841354cd8..f29fcc7eae 100755 --- a/tests/qemu-iotests/066 +++ b/tests/qemu-iotests/066 @@ -27,15 +27,15 @@ echo "QA output created by $seq" here=3D"$PWD" status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc + _cleanup() { _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc - # This tests qocw2-specific low-level functionality _supported_fmt qcow2 _supported_proto generic diff --git a/tests/qemu-iotests/068 b/tests/qemu-iotests/068 index ce33795dda..a0df34898e 100755 --- a/tests/qemu-iotests/068 +++ b/tests/qemu-iotests/068 @@ -27,15 +27,15 @@ echo "QA output created by $seq" here=3D"$PWD" status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc + _cleanup() { _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc - # This tests qocw2-specific low-level functionality _supported_fmt qcow2 _supported_proto generic diff --git a/tests/qemu-iotests/069 b/tests/qemu-iotests/069 index 5cdf0c1e47..e01cbc98f4 100755 --- a/tests/qemu-iotests/069 +++ b/tests/qemu-iotests/069 @@ -27,15 +27,15 @@ echo "QA output created by $seq" here=3D"$PWD" status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc + _cleanup() { _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc - _supported_fmt qed qcow qcow2 vmdk _supported_proto file _supported_os Linux diff --git a/tests/qemu-iotests/070 b/tests/qemu-iotests/070 index 60c4b74a5e..6cbe62e1a0 100755 --- a/tests/qemu-iotests/070 +++ b/tests/qemu-iotests/070 @@ -28,15 +28,15 @@ echo "QA output created by $seq" here=3D`pwd` status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc + _cleanup() { _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc - _supported_fmt vhdx _supported_proto generic _supported_os Linux diff --git a/tests/qemu-iotests/071 b/tests/qemu-iotests/071 index 802b2b9da2..66806e3a8c 100755 --- a/tests/qemu-iotests/071 +++ b/tests/qemu-iotests/071 @@ -27,15 +27,15 @@ echo "QA output created by $seq" here=3D"$PWD" status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc + _cleanup() { _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc - _supported_fmt qcow2 _supported_proto file _supported_os Linux diff --git a/tests/qemu-iotests/072 b/tests/qemu-iotests/072 index 0851a72239..2d28db91d5 100755 --- a/tests/qemu-iotests/072 +++ b/tests/qemu-iotests/072 @@ -27,15 +27,15 @@ echo "QA output created by $seq" here=3D"$PWD" status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc + _cleanup() { _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc - _supported_fmt vpc vmdk vhdx vdi qed qcow2 qcow _supported_proto file _supported_os Linux diff --git a/tests/qemu-iotests/073 b/tests/qemu-iotests/073 index e1982454b0..2738010eb3 100755 --- a/tests/qemu-iotests/073 +++ b/tests/qemu-iotests/073 @@ -27,15 +27,15 @@ echo "QA output created by $seq" here=3D`pwd` status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc + _cleanup() { _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc - _supported_fmt qcow2 _supported_proto generic _unsupported_proto vxhs diff --git a/tests/qemu-iotests/074 b/tests/qemu-iotests/074 index 4ba59ba1d7..0dcbe946da 100755 --- a/tests/qemu-iotests/074 +++ b/tests/qemu-iotests/074 @@ -27,6 +27,10 @@ echo "QA output created by $seq" =20 status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc +. ./common.pattern + _cleanup() { echo "Cleanup" @@ -42,10 +46,6 @@ _compare() echo $? } =20 -# get standard environment, filters and checks -. ./common.rc -. ./common.pattern - _supported_fmt qcow2 _supported_proto file _supported_os Linux diff --git a/tests/qemu-iotests/075 b/tests/qemu-iotests/075 index 8d6179f847..2e819c2a5a 100755 --- a/tests/qemu-iotests/075 +++ b/tests/qemu-iotests/075 @@ -27,15 +27,15 @@ echo "QA output created by $seq" here=3D`pwd` status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc + _cleanup() { _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc - _supported_fmt cloop _supported_proto file _supported_os Linux diff --git a/tests/qemu-iotests/076 b/tests/qemu-iotests/076 index fb5da1fd17..d7406739a1 100755 --- a/tests/qemu-iotests/076 +++ b/tests/qemu-iotests/076 @@ -27,15 +27,15 @@ echo "QA output created by $seq" here=3D`pwd` status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc + _cleanup() { _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc - _supported_fmt parallels _supported_proto file _supported_os Linux diff --git a/tests/qemu-iotests/077 b/tests/qemu-iotests/077 index ec30895982..eb6a189bdf 100755 --- a/tests/qemu-iotests/077 +++ b/tests/qemu-iotests/077 @@ -27,15 +27,15 @@ echo "QA output created by $seq" here=3D`pwd` status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc + _cleanup() { _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc - _supported_fmt raw _supported_proto generic _supported_os Linux diff --git a/tests/qemu-iotests/078 b/tests/qemu-iotests/078 index 74ab4ee259..1664c9c74c 100755 --- a/tests/qemu-iotests/078 +++ b/tests/qemu-iotests/078 @@ -27,15 +27,15 @@ echo "QA output created by $seq" here=3D`pwd` status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc + _cleanup() { _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc - _supported_fmt bochs _supported_proto file _supported_os Linux diff --git a/tests/qemu-iotests/079 b/tests/qemu-iotests/079 index 9c368991d1..fc9de46cc7 100755 --- a/tests/qemu-iotests/079 +++ b/tests/qemu-iotests/079 @@ -27,15 +27,15 @@ echo "QA output created by $seq" here=3D`pwd` status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc + _cleanup() { _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc - _supported_fmt qcow2 _supported_proto file nfs _supported_os Linux diff --git a/tests/qemu-iotests/080 b/tests/qemu-iotests/080 index 4667ca229b..0947ed0559 100755 --- a/tests/qemu-iotests/080 +++ b/tests/qemu-iotests/080 @@ -27,6 +27,9 @@ echo "QA output created by $seq" here=3D`pwd` status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc + _cleanup() { rm -f $TEST_IMG.snap @@ -34,9 +37,6 @@ _cleanup() } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc - _supported_fmt qcow2 _supported_proto file _supported_os Linux diff --git a/tests/qemu-iotests/082 b/tests/qemu-iotests/082 index 7167632e67..64075693f3 100755 --- a/tests/qemu-iotests/082 +++ b/tests/qemu-iotests/082 @@ -27,15 +27,15 @@ echo "QA output created by $seq" here=3D`pwd` status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc + _cleanup() { _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc - _supported_fmt qcow2 _supported_proto file nfs _supported_os Linux diff --git a/tests/qemu-iotests/084 b/tests/qemu-iotests/084 index 9bfa2e57e6..1a610e1ad4 100755 --- a/tests/qemu-iotests/084 +++ b/tests/qemu-iotests/084 @@ -28,15 +28,15 @@ echo "QA output created by $seq" here=3D`pwd` status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc + _cleanup() { _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc - # This tests vdi-specific header fields _supported_fmt vdi _supported_proto file diff --git a/tests/qemu-iotests/085 b/tests/qemu-iotests/085 index 1b330c28ca..12df84d6bc 100755 --- a/tests/qemu-iotests/085 +++ b/tests/qemu-iotests/085 @@ -37,6 +37,10 @@ snapshot_virt1=3D"snapshot-v1.qcow2" =20 SNAPSHOTS=3D10 =20 +# get standard environment, filters and checks +. ./common.rc +. ./common.qemu + _cleanup() { _cleanup_qemu @@ -50,10 +54,6 @@ _cleanup() } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc -. ./common.qemu - _supported_fmt qcow2 _supported_proto file _supported_os Linux diff --git a/tests/qemu-iotests/086 b/tests/qemu-iotests/086 index 859e80a291..9329e14b62 100755 --- a/tests/qemu-iotests/086 +++ b/tests/qemu-iotests/086 @@ -27,15 +27,15 @@ echo "QA output created by $seq" here=3D`pwd` status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc + _cleanup() { _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc - _supported_fmt qcow2 raw _supported_proto file nfs _supported_os Linux diff --git a/tests/qemu-iotests/088 b/tests/qemu-iotests/088 index 2a51616be8..dcde4813d2 100755 --- a/tests/qemu-iotests/088 +++ b/tests/qemu-iotests/088 @@ -27,6 +27,9 @@ echo "QA output created by $seq" here=3D`pwd` status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc + _cleanup() { rm -f $TEST_IMG.snap @@ -34,9 +37,6 @@ _cleanup() } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc - _supported_fmt vpc _supported_proto file _supported_os Linux diff --git a/tests/qemu-iotests/089 b/tests/qemu-iotests/089 index 70aef90ca7..e1093f73c3 100755 --- a/tests/qemu-iotests/089 +++ b/tests/qemu-iotests/089 @@ -27,15 +27,15 @@ echo "QA output created by $seq" here=3D"$PWD" status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc + _cleanup() { _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc - _supported_fmt qcow2 _supported_proto file _supported_os Linux diff --git a/tests/qemu-iotests/090 b/tests/qemu-iotests/090 index 8b141e1043..f88b3a7992 100755 --- a/tests/qemu-iotests/090 +++ b/tests/qemu-iotests/090 @@ -27,15 +27,15 @@ echo "QA output created by $seq" here=3D"$PWD" status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc + _cleanup() { _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc - _supported_fmt qcow2 _supported_proto file nfs _supported_os Linux diff --git a/tests/qemu-iotests/091 b/tests/qemu-iotests/091 index 447514af51..b1c5988c8a 100755 --- a/tests/qemu-iotests/091 +++ b/tests/qemu-iotests/091 @@ -31,6 +31,10 @@ status=3D1 # failure is the default! =20 MIG_FIFO=3D"${TEST_DIR}/migrate" =20 +# get standard environment, filters and checks +. ./common.rc +. ./common.qemu + _cleanup() { rm -f "${MIG_FIFO}" @@ -39,10 +43,6 @@ _cleanup() } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc -. ./common.qemu - _supported_fmt qcow2 _supported_proto file _supported_os Linux diff --git a/tests/qemu-iotests/092 b/tests/qemu-iotests/092 index f11b6747b3..eb6064daeb 100755 --- a/tests/qemu-iotests/092 +++ b/tests/qemu-iotests/092 @@ -27,6 +27,9 @@ echo "QA output created by $seq" here=3D`pwd` status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc + _cleanup() { rm -f $TEST_IMG.snap @@ -34,9 +37,6 @@ _cleanup() } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc - _supported_fmt qcow _supported_proto file _supported_os Linux diff --git a/tests/qemu-iotests/094 b/tests/qemu-iotests/094 index ba14a11ade..e8a07c195b 100755 --- a/tests/qemu-iotests/094 +++ b/tests/qemu-iotests/094 @@ -27,19 +27,18 @@ echo "QA output created by $seq" here=3D"$PWD" status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc +. ./common.qemu + _cleanup() { _cleanup_qemu _cleanup_test_img rm -f "$TEST_DIR/source.$IMGFMT" } - trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc -. ./common.qemu - _supported_fmt generic _supported_proto nbd _supported_os Linux diff --git a/tests/qemu-iotests/095 b/tests/qemu-iotests/095 index c35dc42cd6..da0cc9fed2 100755 --- a/tests/qemu-iotests/095 +++ b/tests/qemu-iotests/095 @@ -30,6 +30,10 @@ echo "QA output created by $seq" here=3D`pwd` status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc +. ./common.qemu + _cleanup() { _cleanup_qemu @@ -38,10 +42,6 @@ _cleanup() } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc -. ./common.qemu - _supported_fmt qcow2 _supported_proto file _supported_os Linux diff --git a/tests/qemu-iotests/097 b/tests/qemu-iotests/097 index 788393e0c6..10aa13a0ce 100755 --- a/tests/qemu-iotests/097 +++ b/tests/qemu-iotests/097 @@ -28,6 +28,10 @@ echo "QA output created by $seq" here=3D"$PWD" status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc +. ./common.pattern + _cleanup() { _cleanup_test_img @@ -35,10 +39,6 @@ _cleanup() } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc -. ./common.pattern - # Any format supporting backing files and bdrv_make_empty _supported_fmt qcow qcow2 _supported_proto file diff --git a/tests/qemu-iotests/098 b/tests/qemu-iotests/098 index 92b1e75817..61c27f1f46 100755 --- a/tests/qemu-iotests/098 +++ b/tests/qemu-iotests/098 @@ -27,6 +27,10 @@ echo "QA output created by $seq" here=3D"$PWD" status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc +. ./common.pattern + _cleanup() { _cleanup_test_img @@ -34,10 +38,6 @@ _cleanup() } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc -. ./common.pattern - _supported_fmt qcow2 _supported_proto file _supported_os Linux diff --git a/tests/qemu-iotests/099 b/tests/qemu-iotests/099 index d103e53ea0..90924c2ad2 100755 --- a/tests/qemu-iotests/099 +++ b/tests/qemu-iotests/099 @@ -28,15 +28,15 @@ echo "QA output created by $seq" here=3D"$PWD" status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc + _cleanup() { _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc - # Basically all formats, but "raw" has issues with _filter_imgfmt regardin= g the # raw comparison image for blkverify; also, all images have to support cre= ation _supported_fmt qcow qcow2 qed vdi vhdx vmdk vpc diff --git a/tests/qemu-iotests/101 b/tests/qemu-iotests/101 index 806da17830..663038378b 100755 --- a/tests/qemu-iotests/101 +++ b/tests/qemu-iotests/101 @@ -27,15 +27,15 @@ echo "QA output created by $seq" here=3D`pwd` status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc + _cleanup() { _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc - _supported_fmt raw _supported_proto file _supported_os Linux diff --git a/tests/qemu-iotests/102 b/tests/qemu-iotests/102 index cdf714412a..4ed1f77542 100755 --- a/tests/qemu-iotests/102 +++ b/tests/qemu-iotests/102 @@ -27,6 +27,10 @@ echo "QA output created by $seq" here=3D$PWD status=3D1 # failure is the default! =20 +# get standard environment, filters and qemu instance handling +. ./common.rc +. ./common.qemu + _cleanup() { _cleanup_qemu @@ -34,10 +38,6 @@ _cleanup() } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and qemu instance handling -. ./common.rc -. ./common.qemu - _supported_fmt qcow2 _supported_proto file _supported_os Linux diff --git a/tests/qemu-iotests/103 b/tests/qemu-iotests/103 index 5326c6e338..0185cc73b2 100755 --- a/tests/qemu-iotests/103 +++ b/tests/qemu-iotests/103 @@ -27,15 +27,15 @@ echo "QA output created by $seq" here=3D$PWD status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc + _cleanup() { _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc - _supported_fmt qcow2 _supported_proto file nfs _supported_os Linux diff --git a/tests/qemu-iotests/105 b/tests/qemu-iotests/105 index 6436a275da..0f1c73eacd 100755 --- a/tests/qemu-iotests/105 +++ b/tests/qemu-iotests/105 @@ -27,15 +27,15 @@ echo "QA output created by $seq" here=3D`pwd` status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc + _cleanup() { _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc - _supported_fmt qcow2 vmdk vhdx qed _supported_proto generic _supported_os Linux diff --git a/tests/qemu-iotests/106 b/tests/qemu-iotests/106 index 0a7b803e12..4adf5b8e74 100755 --- a/tests/qemu-iotests/106 +++ b/tests/qemu-iotests/106 @@ -27,15 +27,15 @@ echo "QA output created by $seq" here=3D$PWD status=3D1 # failure is the default! =20 +# get standard environment and filters +. ./common.rc + _cleanup() { _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment and filters -. ./common.rc - _supported_fmt raw _supported_proto file _supported_os Linux diff --git a/tests/qemu-iotests/107 b/tests/qemu-iotests/107 index f111c3c6fc..92c5854a80 100755 --- a/tests/qemu-iotests/107 +++ b/tests/qemu-iotests/107 @@ -27,15 +27,15 @@ echo "QA output created by $seq" here=3D"$PWD" status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc + _cleanup() { _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc - _supported_fmt qcow2 _supported_proto file nfs _supported_os Linux diff --git a/tests/qemu-iotests/108 b/tests/qemu-iotests/108 index 95bb252fd2..d44fc8ae17 100755 --- a/tests/qemu-iotests/108 +++ b/tests/qemu-iotests/108 @@ -28,15 +28,15 @@ echo "QA output created by $seq" here=3D"$PWD" status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc + _cleanup() { _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc - # This tests qocw2-specific low-level functionality _supported_fmt qcow2 _supported_proto file diff --git a/tests/qemu-iotests/109 b/tests/qemu-iotests/109 index d9b1a344df..6bf5deb664 100755 --- a/tests/qemu-iotests/109 +++ b/tests/qemu-iotests/109 @@ -27,6 +27,10 @@ echo "QA output created by $seq" here=3D"$PWD" status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc +. ./common.qemu + _cleanup() { _cleanup_qemu @@ -35,10 +39,6 @@ _cleanup() } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc -. ./common.qemu - _supported_fmt raw _supported_proto file _supported_os Linux diff --git a/tests/qemu-iotests/110 b/tests/qemu-iotests/110 index 4de36a4d6d..ea8eecb3e7 100755 --- a/tests/qemu-iotests/110 +++ b/tests/qemu-iotests/110 @@ -27,15 +27,15 @@ echo "QA output created by $seq" here=3D"$PWD" status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc + _cleanup() { _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc - # Any format supporting backing files _supported_fmt qed qcow qcow2 vmdk _supported_proto file diff --git a/tests/qemu-iotests/111 b/tests/qemu-iotests/111 index d41dacd948..73396468d4 100755 --- a/tests/qemu-iotests/111 +++ b/tests/qemu-iotests/111 @@ -28,15 +28,15 @@ echo "QA output created by $seq" here=3D"$PWD" status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc + _cleanup() { _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc - _supported_fmt qed qcow qcow2 vmdk _supported_proto file _supported_os Linux diff --git a/tests/qemu-iotests/112 b/tests/qemu-iotests/112 index f8a6a1b888..ac5745a559 100755 --- a/tests/qemu-iotests/112 +++ b/tests/qemu-iotests/112 @@ -27,15 +27,15 @@ echo "QA output created by $seq" here=3D"$PWD" status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc + _cleanup() { _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc - # This tests qcow2-specific low-level functionality _supported_fmt qcow2 _supported_proto file diff --git a/tests/qemu-iotests/113 b/tests/qemu-iotests/113 index c4a176fcf1..69c2dab1bc 100755 --- a/tests/qemu-iotests/113 +++ b/tests/qemu-iotests/113 @@ -28,15 +28,15 @@ echo "QA output created by $seq" here=3D"$PWD" status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc + _cleanup() { _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc - # We can only test one format here because we need its sample file _supported_fmt bochs _supported_proto nbd diff --git a/tests/qemu-iotests/114 b/tests/qemu-iotests/114 index c9fd36ec54..a35f2baa61 100755 --- a/tests/qemu-iotests/114 +++ b/tests/qemu-iotests/114 @@ -27,15 +27,15 @@ echo "QA output created by $seq" here=3D"$PWD" status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc + _cleanup() { _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc - _supported_fmt qcow2 _supported_proto generic _unsupported_proto vxhs diff --git a/tests/qemu-iotests/115 b/tests/qemu-iotests/115 index 26f550c661..cdd095bde2 100755 --- a/tests/qemu-iotests/115 +++ b/tests/qemu-iotests/115 @@ -27,15 +27,15 @@ echo "QA output created by $seq" here=3D"$PWD" status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc + _cleanup() { _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc - _supported_fmt qcow2 _supported_proto file _supported_os Linux diff --git a/tests/qemu-iotests/116 b/tests/qemu-iotests/116 index 1995906cc8..b5e962130b 100755 --- a/tests/qemu-iotests/116 +++ b/tests/qemu-iotests/116 @@ -30,15 +30,15 @@ echo "QA output created by $seq" here=3D`pwd` status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc + _cleanup() { _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc - _supported_fmt qed _supported_proto generic _supported_os Linux diff --git a/tests/qemu-iotests/117 b/tests/qemu-iotests/117 index 205e8842a0..147d19053b 100755 --- a/tests/qemu-iotests/117 +++ b/tests/qemu-iotests/117 @@ -27,17 +27,17 @@ echo "QA output created by $seq" here=3D"$PWD" status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc +. ./common.qemu + _cleanup() { _cleanup_qemu - _cleanup_test_img + _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc -. ./common.qemu - _supported_fmt qcow2 _supported_proto file _supported_os Linux diff --git a/tests/qemu-iotests/119 b/tests/qemu-iotests/119 index bdbdfe0f33..d2342ff0bd 100755 --- a/tests/qemu-iotests/119 +++ b/tests/qemu-iotests/119 @@ -28,15 +28,15 @@ echo "QA output created by $seq" here=3D"$PWD" status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc + _cleanup() { _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc - _supported_fmt raw _supported_proto nbd _supported_os Linux diff --git a/tests/qemu-iotests/120 b/tests/qemu-iotests/120 index 5227278899..83bc551d16 100755 --- a/tests/qemu-iotests/120 +++ b/tests/qemu-iotests/120 @@ -28,15 +28,15 @@ echo "QA output created by $seq" here=3D"$PWD" status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc + _cleanup() { _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc - _supported_fmt generic _supported_proto file _supported_os Linux diff --git a/tests/qemu-iotests/121 b/tests/qemu-iotests/121 index 1b50dc858c..6c69c2beee 100755 --- a/tests/qemu-iotests/121 +++ b/tests/qemu-iotests/121 @@ -27,15 +27,15 @@ echo "QA output created by $seq" here=3D"$PWD" status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc + _cleanup() { _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc - _supported_fmt qcow2 _supported_proto file _supported_os Linux diff --git a/tests/qemu-iotests/122 b/tests/qemu-iotests/122 index b583d44952..10104ea49a 100755 --- a/tests/qemu-iotests/122 +++ b/tests/qemu-iotests/122 @@ -27,6 +27,9 @@ echo "QA output created by $seq" here=3D"$PWD" status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc + _cleanup() { rm -f "$TEST_IMG".[123] @@ -34,9 +37,6 @@ _cleanup() } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc - _supported_fmt qcow2 _supported_proto file _supported_os Linux diff --git a/tests/qemu-iotests/123 b/tests/qemu-iotests/123 index d2e170666e..8f68a76ee4 100755 --- a/tests/qemu-iotests/123 +++ b/tests/qemu-iotests/123 @@ -27,6 +27,9 @@ echo "QA output created by $seq" here=3D"$PWD" status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc + _cleanup() { _cleanup_test_img @@ -34,9 +37,6 @@ _cleanup() } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc - _supported_fmt raw _supported_proto nbd _supported_os Linux diff --git a/tests/qemu-iotests/125 b/tests/qemu-iotests/125 index 03ff104639..62a6d7fb1f 100755 --- a/tests/qemu-iotests/125 +++ b/tests/qemu-iotests/125 @@ -27,6 +27,9 @@ echo "QA output created by $seq" here=3D$PWD status=3D1 # failure is the default! =20 +# get standard environment and filters +. ./common.rc + _cleanup() { _cleanup_test_img @@ -39,9 +42,6 @@ get_image_size_on_host() | sed -e 's/^[^0-9]*\([0-9]\+\).*$/\1/' } =20 -# get standard environment and filters -. ./common.rc - _supported_fmt qcow2 _supported_proto file _supported_os Linux diff --git a/tests/qemu-iotests/127 b/tests/qemu-iotests/127 index ea2679e969..34e1eddc57 100755 --- a/tests/qemu-iotests/127 +++ b/tests/qemu-iotests/127 @@ -27,6 +27,10 @@ echo "QA output created by $seq" here=3D$PWD status=3D1 # failure is the default! =20 +# get standard environment, filters and qemu instance handling +. ./common.rc +. ./common.qemu + _cleanup() { _cleanup_qemu @@ -36,10 +40,6 @@ _cleanup() } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and qemu instance handling -. ./common.rc -. ./common.qemu - _supported_fmt qcow2 _supported_proto file _supported_os Linux diff --git a/tests/qemu-iotests/130 b/tests/qemu-iotests/130 index c0f5782003..4906019543 100755 --- a/tests/qemu-iotests/130 +++ b/tests/qemu-iotests/130 @@ -29,6 +29,10 @@ echo "QA output created by $seq" here=3D"$PWD" status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc +. ./common.qemu + _cleanup() { _cleanup_qemu @@ -36,10 +40,6 @@ _cleanup() } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc -. ./common.qemu - _supported_fmt qcow2 _supported_proto generic _unsupported_proto vxhs diff --git a/tests/qemu-iotests/131 b/tests/qemu-iotests/131 index 142b908981..fb771fed95 100755 --- a/tests/qemu-iotests/131 +++ b/tests/qemu-iotests/131 @@ -27,15 +27,15 @@ echo "QA output created by $seq" here=3D`pwd` status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc + _cleanup() { _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc - _supported_fmt parallels _supported_proto file _supported_os Linux diff --git a/tests/qemu-iotests/133 b/tests/qemu-iotests/133 index 467c31e58d..1daf5895c1 100755 --- a/tests/qemu-iotests/133 +++ b/tests/qemu-iotests/133 @@ -27,15 +27,15 @@ echo "QA output created by $seq" here=3D`pwd` status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc + _cleanup() { _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc - _supported_fmt qcow2 _supported_proto file _supported_os Linux diff --git a/tests/qemu-iotests/134 b/tests/qemu-iotests/134 index 99144151b8..5d476e1b16 100755 --- a/tests/qemu-iotests/134 +++ b/tests/qemu-iotests/134 @@ -27,16 +27,16 @@ echo "QA output created by $seq" here=3D`pwd` status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc +. ./common.filter + _cleanup() { _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc -. ./common.filter - _supported_fmt qcow qcow2 _supported_proto generic _unsupported_proto vxhs diff --git a/tests/qemu-iotests/135 b/tests/qemu-iotests/135 index 5f77ad5885..676e2a2c70 100755 --- a/tests/qemu-iotests/135 +++ b/tests/qemu-iotests/135 @@ -27,15 +27,15 @@ echo "QA output created by $seq" here=3D`pwd` status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc + _cleanup() { _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc - _supported_fmt vpc _supported_proto generic _supported_os Linux diff --git a/tests/qemu-iotests/137 b/tests/qemu-iotests/137 index 1e12b140ae..66ea0e9d1a 100755 --- a/tests/qemu-iotests/137 +++ b/tests/qemu-iotests/137 @@ -27,16 +27,16 @@ echo "QA output created by $seq" here=3D"$PWD" status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc +. ./common.qemu + _cleanup() { _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc -. ./common.qemu - _supported_fmt qcow2 _supported_proto file _supported_os Linux diff --git a/tests/qemu-iotests/138 b/tests/qemu-iotests/138 index 33570ad20d..5624ef11db 100755 --- a/tests/qemu-iotests/138 +++ b/tests/qemu-iotests/138 @@ -27,15 +27,15 @@ echo "QA output created by $seq" here=3D"$PWD" status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc + _cleanup() { _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc - # This tests qocw2-specific low-level functionality _supported_fmt qcow2 _supported_proto file diff --git a/tests/qemu-iotests/140 b/tests/qemu-iotests/140 index 32af253b41..a0d255ee5f 100755 --- a/tests/qemu-iotests/140 +++ b/tests/qemu-iotests/140 @@ -31,6 +31,10 @@ echo "QA output created by $seq" here=3D"$PWD" status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc +. ./common.qemu + _cleanup() { _cleanup_qemu @@ -39,10 +43,6 @@ _cleanup() } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc -. ./common.qemu - _supported_fmt generic _supported_proto file _supported_os Linux diff --git a/tests/qemu-iotests/141 b/tests/qemu-iotests/141 index f9914a91da..0bee4f8cde 100755 --- a/tests/qemu-iotests/141 +++ b/tests/qemu-iotests/141 @@ -27,6 +27,10 @@ echo "QA output created by $seq" here=3D"$PWD" status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc +. ./common.qemu + _cleanup() { _cleanup_qemu @@ -35,10 +39,6 @@ _cleanup() } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc -. ./common.qemu - # Needs backing file and backing format support _supported_fmt qcow2 qed _supported_proto file diff --git a/tests/qemu-iotests/142 b/tests/qemu-iotests/142 index 030269b951..dca66f8675 100755 --- a/tests/qemu-iotests/142 +++ b/tests/qemu-iotests/142 @@ -27,6 +27,9 @@ echo "QA output created by $seq" here=3D`pwd` status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc + _cleanup() { _cleanup_test_img @@ -34,9 +37,6 @@ _cleanup() } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc - _supported_fmt qcow2 _supported_proto file _supported_os Linux diff --git a/tests/qemu-iotests/143 b/tests/qemu-iotests/143 index 2e4acfa580..2a8a1f044f 100755 --- a/tests/qemu-iotests/143 +++ b/tests/qemu-iotests/143 @@ -27,6 +27,10 @@ echo "QA output created by $seq" here=3D"$PWD" status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc +. ./common.qemu + _cleanup() { _cleanup_qemu @@ -34,10 +38,6 @@ _cleanup() } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc -. ./common.qemu - _supported_fmt generic _supported_proto generic _supported_os Linux diff --git a/tests/qemu-iotests/144 b/tests/qemu-iotests/144 index 5879fd86a1..c12441a632 100755 --- a/tests/qemu-iotests/144 +++ b/tests/qemu-iotests/144 @@ -32,6 +32,10 @@ status=3D1 # failure is the default! TMP_SNAP1=3D${TEST_DIR}/tmp.qcow2 TMP_SNAP2=3D${TEST_DIR}/tmp2.qcow2 =20 +# get standard environment, filters and checks +. ./common.rc +. ./common.qemu + _cleanup() { _cleanup_qemu @@ -40,10 +44,6 @@ _cleanup() =20 trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc -. ./common.qemu - _supported_fmt qcow2 _supported_proto file _supported_os Linux diff --git a/tests/qemu-iotests/145 b/tests/qemu-iotests/145 index 6e6181c858..cd02edd3a8 100755 --- a/tests/qemu-iotests/145 +++ b/tests/qemu-iotests/145 @@ -27,6 +27,9 @@ echo "QA output created by $seq" here=3D`pwd` status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc + _cleanup() { _cleanup_test_img @@ -34,9 +37,6 @@ _cleanup() } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc - _supported_fmt generic _supported_proto generic _supported_os Linux diff --git a/tests/qemu-iotests/146 b/tests/qemu-iotests/146 index bdc875d143..30fe5e07bc 100755 --- a/tests/qemu-iotests/146 +++ b/tests/qemu-iotests/146 @@ -27,6 +27,10 @@ echo "QA output created by $seq" here=3D`pwd` status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc +. ./common.qemu + _cleanup() { _cleanup_qemu @@ -34,10 +38,6 @@ _cleanup() } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc -. ./common.qemu - _supported_fmt vpc _supported_proto file _supported_os Linux diff --git a/tests/qemu-iotests/150 b/tests/qemu-iotests/150 index 182cf41597..6e77566d78 100755 --- a/tests/qemu-iotests/150 +++ b/tests/qemu-iotests/150 @@ -27,15 +27,15 @@ echo "QA output created by $seq" here=3D"$PWD" status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc + _cleanup() { _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc - _supported_fmt raw qcow2 _supported_proto file _supported_os Linux diff --git a/tests/qemu-iotests/153 b/tests/qemu-iotests/153 index 6d93726108..6947b017f0 100755 --- a/tests/qemu-iotests/153 +++ b/tests/qemu-iotests/153 @@ -28,6 +28,10 @@ here=3D"$PWD" tmp=3D/tmp/$$ status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc +. ./common.qemu + _cleanup() { _cleanup_test_img @@ -40,10 +44,6 @@ _cleanup() } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc -. ./common.qemu - size=3D32M =20 _check_ofd() diff --git a/tests/qemu-iotests/154 b/tests/qemu-iotests/154 index 2dcbed329d..d8f07422ca 100755 --- a/tests/qemu-iotests/154 +++ b/tests/qemu-iotests/154 @@ -27,15 +27,15 @@ echo "QA output created by $seq" here=3D`pwd` status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc + _cleanup() { _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc - _supported_fmt qcow2 _supported_proto file _supported_os Linux diff --git a/tests/qemu-iotests/156 b/tests/qemu-iotests/156 index 02c52c7ec6..907d5f4e42 100755 --- a/tests/qemu-iotests/156 +++ b/tests/qemu-iotests/156 @@ -35,6 +35,10 @@ echo "QA output created by $seq" here=3D"$PWD" status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc +. ./common.qemu + _cleanup() { _cleanup_qemu @@ -42,10 +46,6 @@ _cleanup() } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc -. ./common.qemu - _supported_fmt qcow2 qed _supported_proto generic _unsupported_proto vxhs diff --git a/tests/qemu-iotests/157 b/tests/qemu-iotests/157 index 1f273856fd..4f2e299008 100755 --- a/tests/qemu-iotests/157 +++ b/tests/qemu-iotests/157 @@ -27,15 +27,15 @@ echo "QA output created by $seq" here=3D"$PWD" status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc + _cleanup() { _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc - _supported_fmt generic _supported_proto file _supported_os Linux diff --git a/tests/qemu-iotests/158 b/tests/qemu-iotests/158 index 22a17f92cb..51c46dd259 100755 --- a/tests/qemu-iotests/158 +++ b/tests/qemu-iotests/158 @@ -27,15 +27,15 @@ echo "QA output created by $seq" here=3D`pwd` status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc + _cleanup() { _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc - _supported_fmt qcow qcow2 _supported_proto generic _unsupported_proto vxhs diff --git a/tests/qemu-iotests/159 b/tests/qemu-iotests/159 index 250905c264..463228de96 100755 --- a/tests/qemu-iotests/159 +++ b/tests/qemu-iotests/159 @@ -26,6 +26,9 @@ echo "QA output created by $seq" here=3D"$PWD" status=3D1 =20 +. ./common.rc +. ./common.pattern + _cleanup() { _cleanup_test_img @@ -33,9 +36,6 @@ _cleanup() } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -. ./common.rc -. ./common.pattern - _supported_fmt generic _supported_proto file _supported_os Linux diff --git a/tests/qemu-iotests/160 b/tests/qemu-iotests/160 index 7ec68d712e..ae6f799c9f 100755 --- a/tests/qemu-iotests/160 +++ b/tests/qemu-iotests/160 @@ -26,6 +26,9 @@ echo "QA output created by $seq" here=3D"$PWD" status=3D1 =20 +. ./common.rc +. ./common.pattern + _cleanup() { _cleanup_test_img @@ -33,9 +36,6 @@ _cleanup() } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -. ./common.rc -. ./common.pattern - _supported_fmt raw _supported_proto file _supported_os Linux diff --git a/tests/qemu-iotests/170 b/tests/qemu-iotests/170 index 2f76d43101..9454485e52 100755 --- a/tests/qemu-iotests/170 +++ b/tests/qemu-iotests/170 @@ -26,6 +26,9 @@ echo "QA output created by $seq" here=3D"$PWD" status=3D1 =20 +. ./common.rc +. ./common.pattern + _cleanup() { _cleanup_test_img @@ -33,9 +36,6 @@ _cleanup() } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -. ./common.rc -. ./common.pattern - _supported_fmt generic _supported_proto file _supported_os Linux diff --git a/tests/qemu-iotests/171 b/tests/qemu-iotests/171 index d703cae210..2c6d6e4995 100755 --- a/tests/qemu-iotests/171 +++ b/tests/qemu-iotests/171 @@ -28,15 +28,15 @@ echo "QA output created by $seq" here=3D`pwd` status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc + _cleanup() { _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc - _supported_fmt raw _supported_proto file _supported_os Linux diff --git a/tests/qemu-iotests/172 b/tests/qemu-iotests/172 index 9da3d60146..0b63d0b116 100755 --- a/tests/qemu-iotests/172 +++ b/tests/qemu-iotests/172 @@ -27,17 +27,17 @@ echo "QA output created by $seq" here=3D`pwd` status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc + _cleanup() { - _cleanup_test_img + _cleanup_test_img rm -f "$TEST_IMG.2" rm -f "$TEST_IMG.3" } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc - _supported_fmt qcow2 _supported_proto file _supported_os Linux diff --git a/tests/qemu-iotests/173 b/tests/qemu-iotests/173 index ef1ed9cdd1..f08f4d93d1 100755 --- a/tests/qemu-iotests/173 +++ b/tests/qemu-iotests/173 @@ -27,6 +27,10 @@ echo "QA output created by $seq" here=3D`pwd` status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc +. ./common.qemu + _cleanup() { _cleanup_qemu @@ -35,10 +39,6 @@ _cleanup() } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc -. ./common.qemu - _supported_fmt qcow2 _supported_proto nfs _supported_os Linux diff --git a/tests/qemu-iotests/174 b/tests/qemu-iotests/174 index a5a4ef65fb..46f557402f 100755 --- a/tests/qemu-iotests/174 +++ b/tests/qemu-iotests/174 @@ -27,15 +27,15 @@ echo "QA output created by $seq" here=3D`pwd` status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc + _cleanup() { _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc - _unsupported_fmt raw =20 =20 diff --git a/tests/qemu-iotests/175 b/tests/qemu-iotests/175 index 4e270ce41e..d96ac79b04 100755 --- a/tests/qemu-iotests/175 +++ b/tests/qemu-iotests/175 @@ -27,15 +27,15 @@ echo "QA output created by $seq" here=3D`pwd` status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc + _cleanup() { _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc - _supported_fmt raw _supported_proto file _supported_os Linux diff --git a/tests/qemu-iotests/176 b/tests/qemu-iotests/176 index d2f53acb1d..b0f87e4bf4 100755 --- a/tests/qemu-iotests/176 +++ b/tests/qemu-iotests/176 @@ -31,6 +31,10 @@ echo "QA output created by $seq" here=3D"$PWD" status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc +. ./common.pattern + _cleanup() { _cleanup_test_img @@ -38,10 +42,6 @@ _cleanup() } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc -. ./common.pattern - # Any format supporting backing files and bdrv_make_empty _supported_fmt qcow2 _supported_proto file diff --git a/tests/qemu-iotests/177 b/tests/qemu-iotests/177 index b3ef552103..3afad516da 100755 --- a/tests/qemu-iotests/177 +++ b/tests/qemu-iotests/177 @@ -27,15 +27,15 @@ echo "QA output created by $seq" here=3D`pwd` status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc + _cleanup() { _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc - _supported_fmt qcow2 _supported_proto file =20 diff --git a/tests/qemu-iotests/178 b/tests/qemu-iotests/178 index b5df4f5cc2..875b4e002b 100755 --- a/tests/qemu-iotests/178 +++ b/tests/qemu-iotests/178 @@ -27,6 +27,10 @@ echo "QA output created by $seq" here=3D`pwd` status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc +. ./common.pattern + _cleanup() { _cleanup_test_img @@ -34,10 +38,6 @@ _cleanup() } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc -. ./common.pattern - _supported_fmt raw qcow2 _supported_proto file _supported_os Linux diff --git a/tests/qemu-iotests/179 b/tests/qemu-iotests/179 index 7a68986536..45f82a1a2d 100755 --- a/tests/qemu-iotests/179 +++ b/tests/qemu-iotests/179 @@ -27,16 +27,16 @@ echo "QA output created by $seq" here=3D"$PWD" status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc + _cleanup() { - _cleanup_test_img + _cleanup_test_img rm -f "$TEST_DIR/blkdebug.conf" } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc - _supported_fmt qcow2 _supported_proto file _supported_os Linux diff --git a/tests/qemu-iotests/181 b/tests/qemu-iotests/181 index 51b597fc13..c0254623b1 100755 --- a/tests/qemu-iotests/181 +++ b/tests/qemu-iotests/181 @@ -29,18 +29,18 @@ status=3D1 # failure is the default! =20 MIG_SOCKET=3D"${TEST_DIR}/migrate" =20 +# get standard environment, filters and checks +. ./common.rc +. ./common.qemu + _cleanup() { rm -f "${MIG_SOCKET}" - _cleanup_test_img + _cleanup_test_img _cleanup_qemu } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc -. ./common.qemu - _supported_fmt generic # Formats that do not support live migration _unsupported_fmt qcow vdi vhdx vmdk vpc vvfat diff --git a/tests/qemu-iotests/182 b/tests/qemu-iotests/182 index 7293d50bcb..4fbc1d95f9 100755 --- a/tests/qemu-iotests/182 +++ b/tests/qemu-iotests/182 @@ -28,16 +28,16 @@ here=3D"$PWD" tmp=3D/tmp/$$ status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc +. ./common.qemu + _cleanup() { _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc -. ./common.qemu - _supported_fmt qcow2 _supported_proto file _supported_os Linux diff --git a/tests/qemu-iotests/183 b/tests/qemu-iotests/183 index ead98f3a4f..320d03e6f6 100755 --- a/tests/qemu-iotests/183 +++ b/tests/qemu-iotests/183 @@ -29,6 +29,10 @@ status=3D1 # failure is the default! =20 MIG_SOCKET=3D"${TEST_DIR}/migrate" =20 +# get standard environment, filters and checks +. ./common.rc +. ./common.qemu + _cleanup() { rm -f "${MIG_SOCKET}" @@ -38,10 +42,6 @@ _cleanup() } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc -. ./common.qemu - _supported_fmt qcow2 raw qed dmg quorum _supported_proto file _supported_os Linux diff --git a/tests/qemu-iotests/184 b/tests/qemu-iotests/184 index 487e854272..e2af0660c7 100755 --- a/tests/qemu-iotests/184 +++ b/tests/qemu-iotests/184 @@ -27,15 +27,15 @@ echo "QA output created by $seq" here=3D`pwd` status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc + _cleanup() { _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc - _supported_fmt qcow2 _supported_proto file _supported_os Linux diff --git a/tests/qemu-iotests/185 b/tests/qemu-iotests/185 index fab1d54af0..7ba20c9eb7 100755 --- a/tests/qemu-iotests/185 +++ b/tests/qemu-iotests/185 @@ -29,6 +29,10 @@ status=3D1 # failure is the default! =20 MIG_SOCKET=3D"${TEST_DIR}/migrate" =20 +# get standard environment, filters and checks +. ./common.rc +. ./common.qemu + _cleanup() { rm -f "${TEST_IMG}.mid" @@ -38,10 +42,6 @@ _cleanup() } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc -. ./common.qemu - _supported_fmt qcow2 _supported_proto file _supported_os Linux diff --git a/tests/qemu-iotests/186 b/tests/qemu-iotests/186 index fcf9204801..c7e28d4435 100755 --- a/tests/qemu-iotests/186 +++ b/tests/qemu-iotests/186 @@ -27,15 +27,15 @@ echo "QA output created by $seq" here=3D`pwd` status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc + _cleanup() { _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc - _supported_fmt qcow2 _supported_proto file _supported_os Linux diff --git a/tests/qemu-iotests/187 b/tests/qemu-iotests/187 index dfd1da9469..a53d2637e0 100755 --- a/tests/qemu-iotests/187 +++ b/tests/qemu-iotests/187 @@ -27,17 +27,17 @@ echo "QA output created by $seq" here=3D`pwd` status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc + _cleanup() { - _cleanup_test_img + _cleanup_test_img rm -f "$TEST_IMG.2" rm -f "$TEST_IMG.3" } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc - _supported_fmt qcow2 _supported_proto file _supported_os Linux diff --git a/tests/qemu-iotests/188 b/tests/qemu-iotests/188 index 481e77dc17..ba523e0b50 100755 --- a/tests/qemu-iotests/188 +++ b/tests/qemu-iotests/188 @@ -27,15 +27,15 @@ echo "QA output created by $seq" here=3D`pwd` status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc + _cleanup() { _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc - _supported_fmt qcow2 _supported_proto generic _supported_os Linux diff --git a/tests/qemu-iotests/189 b/tests/qemu-iotests/189 index 6ab55b618a..a2f62fc520 100755 --- a/tests/qemu-iotests/189 +++ b/tests/qemu-iotests/189 @@ -27,15 +27,15 @@ echo "QA output created by $seq" here=3D`pwd` status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc + _cleanup() { _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc - _supported_fmt qcow2 _supported_proto generic _supported_os Linux diff --git a/tests/qemu-iotests/190 b/tests/qemu-iotests/190 index 179949bd3b..0a848a6c94 100755 --- a/tests/qemu-iotests/190 +++ b/tests/qemu-iotests/190 @@ -27,6 +27,10 @@ echo "QA output created by $seq" here=3D`pwd` status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc +. ./common.pattern + _cleanup() { _cleanup_test_img @@ -34,10 +38,6 @@ _cleanup() } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc -. ./common.pattern - # See 178 for more extensive tests across more formats _supported_fmt qcow2 _supported_proto file diff --git a/tests/qemu-iotests/191 b/tests/qemu-iotests/191 index ce6284a05e..b29822c9c3 100755 --- a/tests/qemu-iotests/191 +++ b/tests/qemu-iotests/191 @@ -29,6 +29,10 @@ status=3D1 # failure is the default! =20 MIG_SOCKET=3D"${TEST_DIR}/migrate" =20 +# get standard environment, filters and checks +. ./common.rc +. ./common.qemu + _cleanup() { rm -f "${TEST_IMG}.mid" @@ -39,10 +43,6 @@ _cleanup() } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc -. ./common.qemu - _supported_fmt qcow2 _unsupported_imgopts compat=3D0.10 _supported_proto file diff --git a/tests/qemu-iotests/192 b/tests/qemu-iotests/192 index 4d0776432a..4bf2ea2757 100755 --- a/tests/qemu-iotests/192 +++ b/tests/qemu-iotests/192 @@ -28,16 +28,16 @@ echo "QA output created by $seq" here=3D`pwd` status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc +. ./common.qemu + _cleanup() { _cleanup_test_img } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc -. ./common.qemu - _supported_fmt generic _supported_proto file _supported_os Linux diff --git a/tests/qemu-iotests/195 b/tests/qemu-iotests/195 index 810054a085..31135ac290 100755 --- a/tests/qemu-iotests/195 +++ b/tests/qemu-iotests/195 @@ -27,6 +27,9 @@ echo "QA output created by $seq" here=3D`pwd` status=3D1 # failure is the default! =20 +# get standard environment, filters and checks +. ./common.rc + _cleanup() { _cleanup_test_img @@ -34,9 +37,6 @@ _cleanup() } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 -# get standard environment, filters and checks -. ./common.rc - _supported_fmt qcow2 _supported_proto file _supported_os Linux --=20 2.13.6 From nobody Sat May 4 14:04:10 2024 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; 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 1510854472024847.7188331025352; Thu, 16 Nov 2017 09:47:52 -0800 (PST) Received: from localhost ([::1]:42191 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eFOGQ-0006iP-Ug for importer@patchew.org; Thu, 16 Nov 2017 12:47:46 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60029) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eFO7x-0007sK-O4 for qemu-devel@nongnu.org; Thu, 16 Nov 2017 12:39:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eFO7p-0003xG-6i for qemu-devel@nongnu.org; Thu, 16 Nov 2017 12:39:01 -0500 Received: from mx1.redhat.com ([209.132.183.28]:53290) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eFO7R-0002vW-G3; Thu, 16 Nov 2017 12:38:29 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9DE837F3F4; Thu, 16 Nov 2017 17:38:28 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-120-124.rdu2.redhat.com [10.10.120.124]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D0D33614D0; Thu, 16 Nov 2017 17:38:27 +0000 (UTC) From: Cleber Rosa To: qemu-devel@nongnu.org Date: Thu, 16 Nov 2017 12:38:06 -0500 Message-Id: <20171116173810.16457-7-crosa@redhat.com> In-Reply-To: <20171116173810.16457-1-crosa@redhat.com> References: <20171116173810.16457-1-crosa@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Thu, 16 Nov 2017 17:38:28 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 06/10] qemu-iotests: turn owner variable into a comment 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: Kevin Wolf , Cleber Rosa , qemu-block@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This variables has no real use. To avoid pretending it does, while still keeping the information, let's turn it into a comment. The format chosen is the one already being used on tests 149 and 194. Signed-off-by: Cleber Rosa --- tests/qemu-iotests/001 | 5 ++--- tests/qemu-iotests/002 | 5 ++--- tests/qemu-iotests/003 | 5 ++--- tests/qemu-iotests/004 | 5 ++--- tests/qemu-iotests/005 | 5 ++--- tests/qemu-iotests/007 | 5 ++--- tests/qemu-iotests/008 | 5 ++--- tests/qemu-iotests/009 | 5 ++--- tests/qemu-iotests/010 | 5 ++--- tests/qemu-iotests/011 | 5 ++--- tests/qemu-iotests/012 | 5 ++--- tests/qemu-iotests/013 | 5 ++--- tests/qemu-iotests/014 | 5 ++--- tests/qemu-iotests/015 | 5 ++--- tests/qemu-iotests/017 | 5 ++--- tests/qemu-iotests/018 | 5 ++--- tests/qemu-iotests/019 | 5 ++--- tests/qemu-iotests/020 | 5 ++--- tests/qemu-iotests/021 | 5 ++--- tests/qemu-iotests/022 | 5 ++--- tests/qemu-iotests/023 | 5 ++--- tests/qemu-iotests/024 | 5 ++--- tests/qemu-iotests/025 | 5 ++--- tests/qemu-iotests/026 | 5 ++--- tests/qemu-iotests/027 | 5 ++--- tests/qemu-iotests/028 | 5 ++--- tests/qemu-iotests/029 | 5 ++--- tests/qemu-iotests/031 | 5 ++--- tests/qemu-iotests/032 | 5 ++--- tests/qemu-iotests/033 | 5 ++--- tests/qemu-iotests/034 | 5 ++--- tests/qemu-iotests/035 | 5 ++--- tests/qemu-iotests/036 | 5 ++--- tests/qemu-iotests/037 | 5 ++--- tests/qemu-iotests/038 | 5 ++--- tests/qemu-iotests/039 | 5 ++--- tests/qemu-iotests/040 | 1 + tests/qemu-iotests/042 | 5 ++--- tests/qemu-iotests/043 | 5 ++--- tests/qemu-iotests/046 | 5 ++--- tests/qemu-iotests/047 | 5 ++--- tests/qemu-iotests/048 | 4 ++-- tests/qemu-iotests/049 | 5 ++--- tests/qemu-iotests/050 | 5 ++--- tests/qemu-iotests/051 | 5 ++--- tests/qemu-iotests/052 | 5 ++--- tests/qemu-iotests/053 | 5 ++--- tests/qemu-iotests/054 | 5 ++--- tests/qemu-iotests/058 | 5 ++--- tests/qemu-iotests/059 | 5 ++--- tests/qemu-iotests/060 | 5 ++--- tests/qemu-iotests/061 | 5 ++--- tests/qemu-iotests/062 | 5 ++--- tests/qemu-iotests/063 | 5 ++--- tests/qemu-iotests/064 | 5 ++--- tests/qemu-iotests/066 | 5 ++--- tests/qemu-iotests/067 | 5 ++--- tests/qemu-iotests/068 | 5 ++--- tests/qemu-iotests/069 | 5 ++--- tests/qemu-iotests/070 | 5 ++--- tests/qemu-iotests/071 | 5 ++--- tests/qemu-iotests/072 | 5 ++--- tests/qemu-iotests/073 | 5 ++--- tests/qemu-iotests/074 | 3 +-- tests/qemu-iotests/075 | 5 ++--- tests/qemu-iotests/076 | 5 ++--- tests/qemu-iotests/077 | 5 ++--- tests/qemu-iotests/078 | 5 ++--- tests/qemu-iotests/079 | 5 ++--- tests/qemu-iotests/080 | 5 ++--- tests/qemu-iotests/081 | 5 ++--- tests/qemu-iotests/082 | 5 ++--- tests/qemu-iotests/083 | 5 ++--- tests/qemu-iotests/084 | 5 ++--- tests/qemu-iotests/085 | 5 ++--- tests/qemu-iotests/086 | 5 ++--- tests/qemu-iotests/087 | 5 ++--- tests/qemu-iotests/088 | 5 ++--- tests/qemu-iotests/089 | 5 ++--- tests/qemu-iotests/090 | 5 ++--- tests/qemu-iotests/091 | 5 ++--- tests/qemu-iotests/092 | 5 ++--- tests/qemu-iotests/094 | 5 ++--- tests/qemu-iotests/095 | 4 ++-- tests/qemu-iotests/097 | 5 ++--- tests/qemu-iotests/098 | 5 ++--- tests/qemu-iotests/099 | 5 ++--- tests/qemu-iotests/101 | 5 ++--- tests/qemu-iotests/102 | 5 ++--- tests/qemu-iotests/103 | 5 ++--- tests/qemu-iotests/104 | 5 ++--- tests/qemu-iotests/105 | 5 ++--- tests/qemu-iotests/106 | 5 ++--- tests/qemu-iotests/107 | 5 ++--- tests/qemu-iotests/108 | 5 ++--- tests/qemu-iotests/109 | 5 ++--- tests/qemu-iotests/110 | 5 ++--- tests/qemu-iotests/111 | 5 ++--- tests/qemu-iotests/112 | 5 ++--- tests/qemu-iotests/113 | 5 ++--- tests/qemu-iotests/114 | 5 ++--- tests/qemu-iotests/115 | 5 ++--- tests/qemu-iotests/116 | 5 ++--- tests/qemu-iotests/117 | 5 ++--- tests/qemu-iotests/119 | 5 ++--- tests/qemu-iotests/120 | 5 ++--- tests/qemu-iotests/121 | 5 ++--- tests/qemu-iotests/122 | 5 ++--- tests/qemu-iotests/123 | 5 ++--- tests/qemu-iotests/125 | 5 ++--- tests/qemu-iotests/126 | 5 ++--- tests/qemu-iotests/127 | 5 ++--- tests/qemu-iotests/128 | 5 ++--- tests/qemu-iotests/130 | 5 ++--- tests/qemu-iotests/131 | 5 ++--- tests/qemu-iotests/133 | 5 ++--- tests/qemu-iotests/134 | 5 ++--- tests/qemu-iotests/135 | 5 ++--- tests/qemu-iotests/137 | 5 ++--- tests/qemu-iotests/138 | 5 ++--- tests/qemu-iotests/140 | 5 ++--- tests/qemu-iotests/141 | 5 ++--- tests/qemu-iotests/142 | 5 ++--- tests/qemu-iotests/143 | 5 ++--- tests/qemu-iotests/144 | 5 ++--- tests/qemu-iotests/145 | 5 ++--- tests/qemu-iotests/146 | 5 ++--- tests/qemu-iotests/150 | 5 ++--- tests/qemu-iotests/153 | 5 ++--- tests/qemu-iotests/154 | 5 ++--- tests/qemu-iotests/156 | 5 ++--- tests/qemu-iotests/157 | 5 ++--- tests/qemu-iotests/158 | 5 ++--- tests/qemu-iotests/159 | 4 ++-- tests/qemu-iotests/160 | 4 ++-- tests/qemu-iotests/162 | 5 ++--- tests/qemu-iotests/170 | 4 ++-- tests/qemu-iotests/171 | 5 ++--- tests/qemu-iotests/172 | 5 ++--- tests/qemu-iotests/173 | 4 ++-- tests/qemu-iotests/174 | 5 ++--- tests/qemu-iotests/175 | 5 ++--- tests/qemu-iotests/176 | 5 ++--- tests/qemu-iotests/177 | 5 ++--- tests/qemu-iotests/178 | 5 ++--- tests/qemu-iotests/179 | 5 ++--- tests/qemu-iotests/181 | 5 ++--- tests/qemu-iotests/182 | 5 ++--- tests/qemu-iotests/183 | 5 ++--- tests/qemu-iotests/184 | 5 ++--- tests/qemu-iotests/185 | 5 ++--- tests/qemu-iotests/186 | 5 ++--- tests/qemu-iotests/187 | 5 ++--- tests/qemu-iotests/188 | 5 ++--- tests/qemu-iotests/189 | 5 ++--- tests/qemu-iotests/190 | 5 ++--- tests/qemu-iotests/191 | 5 ++--- tests/qemu-iotests/192 | 5 ++--- tests/qemu-iotests/195 | 5 ++--- tests/qemu-iotests/197 | 5 ++--- 160 files changed, 318 insertions(+), 470 deletions(-) diff --git a/tests/qemu-iotests/001 b/tests/qemu-iotests/001 index 22d82e4be8..b38fb0c73d 100755 --- a/tests/qemu-iotests/001 +++ b/tests/qemu-iotests/001 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dhch@lst.de +# Creator/Owner: hch@lst.de +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/002 b/tests/qemu-iotests/002 index 6fd7183974..608d62652a 100755 --- a/tests/qemu-iotests/002 +++ b/tests/qemu-iotests/002 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dhch@lst.de +# Creator/Owner: hch@lst.de +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/003 b/tests/qemu-iotests/003 index acad5a2a4d..68beb32aea 100755 --- a/tests/qemu-iotests/003 +++ b/tests/qemu-iotests/003 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dhch@lst.de +# Creator/Owner: hch@lst.de +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/004 b/tests/qemu-iotests/004 index 954a46ef7b..5afb23c9fd 100755 --- a/tests/qemu-iotests/004 +++ b/tests/qemu-iotests/004 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dhch@lst.de +# Creator/Owner: hch@lst.de +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/005 b/tests/qemu-iotests/005 index f77caab3eb..a860062847 100755 --- a/tests/qemu-iotests/005 +++ b/tests/qemu-iotests/005 @@ -20,9 +20,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dhch@lst.de +# Creator/Owner: hch@lst.de +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/007 b/tests/qemu-iotests/007 index b0bd1e1520..f9048f9a7a 100755 --- a/tests/qemu-iotests/007 +++ b/tests/qemu-iotests/007 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dkwolf@redhat.com +# Creator/Owner: kwolf@redhat.com +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/008 b/tests/qemu-iotests/008 index 7ab1a403f1..7755c00a43 100755 --- a/tests/qemu-iotests/008 +++ b/tests/qemu-iotests/008 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dhch@lst.de +# Creator/Owner: hch@lst.de +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/009 b/tests/qemu-iotests/009 index aeaed1d782..418c0a56f7 100755 --- a/tests/qemu-iotests/009 +++ b/tests/qemu-iotests/009 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dkwolf@redhat.com +# Creator/Owner: kwolf@redhat.com +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/010 b/tests/qemu-iotests/010 index ce3e939796..6e9beb953d 100755 --- a/tests/qemu-iotests/010 +++ b/tests/qemu-iotests/010 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dkwolf@redhat.com +# Creator/Owner: kwolf@redhat.com +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/011 b/tests/qemu-iotests/011 index 8c98c9510e..275b0cc29c 100755 --- a/tests/qemu-iotests/011 +++ b/tests/qemu-iotests/011 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dkwolf@redhat.com +# Creator/Owner: kwolf@redhat.com +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/012 b/tests/qemu-iotests/012 index 484b47a9d3..59cac183e2 100755 --- a/tests/qemu-iotests/012 +++ b/tests/qemu-iotests/012 @@ -19,9 +19,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dhch@lst.de +# Creator/Owner: hch@lst.de +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/013 b/tests/qemu-iotests/013 index afc4c5a2b0..d33969be6a 100755 --- a/tests/qemu-iotests/013 +++ b/tests/qemu-iotests/013 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dkwolf@redhat.com +# Creator/Owner: kwolf@redhat.com +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/014 b/tests/qemu-iotests/014 index 7307e10015..360379f2b3 100755 --- a/tests/qemu-iotests/014 +++ b/tests/qemu-iotests/014 @@ -19,9 +19,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dkwolf@redhat.com +# Creator/Owner: kwolf@redhat.com +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/015 b/tests/qemu-iotests/015 index 735f597dac..c1b920fd56 100755 --- a/tests/qemu-iotests/015 +++ b/tests/qemu-iotests/015 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dkwolf@redhat.com +# Creator/Owner: kwolf@redhat.com +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/017 b/tests/qemu-iotests/017 index 765dee9157..b2a95c5166 100755 --- a/tests/qemu-iotests/017 +++ b/tests/qemu-iotests/017 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dkwolf@redhat.com +# Creator/Owner: kwolf@redhat.com +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/018 b/tests/qemu-iotests/018 index ae7907c1e9..5375eae206 100755 --- a/tests/qemu-iotests/018 +++ b/tests/qemu-iotests/018 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dkwolf@redhat.com +# Creator/Owner: kwolf@redhat.com +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/019 b/tests/qemu-iotests/019 index 3b0e97feb9..c2af8a0236 100755 --- a/tests/qemu-iotests/019 +++ b/tests/qemu-iotests/019 @@ -19,9 +19,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dkwolf@redhat.com +# Creator/Owner: kwolf@redhat.com +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/020 b/tests/qemu-iotests/020 index a2bad2f04e..0361809a6d 100755 --- a/tests/qemu-iotests/020 +++ b/tests/qemu-iotests/020 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dkwolf@redhat.com +# Creator/Owner: kwolf@redhat.com +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/021 b/tests/qemu-iotests/021 index e34d50be52..2ea6b1d161 100755 --- a/tests/qemu-iotests/021 +++ b/tests/qemu-iotests/021 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dhch@lst.de +# Creator/Owner: hch@lst.de +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/022 b/tests/qemu-iotests/022 index 13c13e3e3e..f577278db9 100755 --- a/tests/qemu-iotests/022 +++ b/tests/qemu-iotests/022 @@ -19,9 +19,8 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 # USA # - -# creator -owner=3Dkwolf@redhat.com +# Creator/Owner: kwolf@redhat.com +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/023 b/tests/qemu-iotests/023 index c7d64cf026..ca8440ad83 100755 --- a/tests/qemu-iotests/023 +++ b/tests/qemu-iotests/023 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dkwolf@redhat.com +# Creator/Owner: kwolf@redhat.com +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/024 b/tests/qemu-iotests/024 index d2efc27aae..189d5c3fc1 100755 --- a/tests/qemu-iotests/024 +++ b/tests/qemu-iotests/024 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dkwolf@redhat.com +# Creator/Owner: kwolf@redhat.com +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/025 b/tests/qemu-iotests/025 index afb5cf0ae0..eb12d1c7d6 100755 --- a/tests/qemu-iotests/025 +++ b/tests/qemu-iotests/025 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dstefanha@linux.vnet.ibm.com +# Creator/Owner: stefanha@linux.vnet.ibm.com +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/026 b/tests/qemu-iotests/026 index a3be017ccb..3fb915f289 100755 --- a/tests/qemu-iotests/026 +++ b/tests/qemu-iotests/026 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dkwolf@redhat.com +# Creator/Owner: kwolf@redhat.com +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/027 b/tests/qemu-iotests/027 index ea950e09d1..9a25a63c28 100755 --- a/tests/qemu-iotests/027 +++ b/tests/qemu-iotests/027 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dstefanha@linux.vnet.ibm.com +# Creator/Owner: stefanha@linux.vnet.ibm.com +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/028 b/tests/qemu-iotests/028 index 0192004d84..e75611bab3 100755 --- a/tests/qemu-iotests/028 +++ b/tests/qemu-iotests/028 @@ -20,9 +20,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dstefanha@linux.vnet.ibm.com +# Creator/Owner: stefanha@linux.vnet.ibm.com +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/029 b/tests/qemu-iotests/029 index d18d004e18..01ed075402 100755 --- a/tests/qemu-iotests/029 +++ b/tests/qemu-iotests/029 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dkwolf@redhat.com +# Creator/Owner: kwolf@redhat.com +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/031 b/tests/qemu-iotests/031 index b2aa016e00..1ac200f191 100755 --- a/tests/qemu-iotests/031 +++ b/tests/qemu-iotests/031 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dkwolf@redhat.com +# Creator/Owner: kwolf@redhat.com +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/032 b/tests/qemu-iotests/032 index 97404db0da..c9f9cf5439 100755 --- a/tests/qemu-iotests/032 +++ b/tests/qemu-iotests/032 @@ -19,9 +19,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dkwolf@redhat.com +# Creator/Owner: kwolf@redhat.com +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/033 b/tests/qemu-iotests/033 index 1b9c3ba37a..dd8fc32ea8 100755 --- a/tests/qemu-iotests/033 +++ b/tests/qemu-iotests/033 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dpbonzini@redhat.com +# Creator/Owner: pbonzini@redhat.com +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/034 b/tests/qemu-iotests/034 index 8c9db83134..1bdd7f2e04 100755 --- a/tests/qemu-iotests/034 +++ b/tests/qemu-iotests/034 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dkwolf@redhat.com +# Creator/Owner: kwolf@redhat.com +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/035 b/tests/qemu-iotests/035 index cead994725..1cd2475ba6 100755 --- a/tests/qemu-iotests/035 +++ b/tests/qemu-iotests/035 @@ -18,9 +18,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dkwolf@redhat.com +# Creator/Owner: kwolf@redhat.com +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/036 b/tests/qemu-iotests/036 index 07f3d30f77..e49e4a7f85 100755 --- a/tests/qemu-iotests/036 +++ b/tests/qemu-iotests/036 @@ -20,9 +20,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dstefanha@linux.vnet.ibm.com +# Creator/Owner: stefanha@linux.vnet.ibm.com +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/037 b/tests/qemu-iotests/037 index 510d113990..06ba02a9f9 100755 --- a/tests/qemu-iotests/037 +++ b/tests/qemu-iotests/037 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dkwolf@redhat.com +# Creator/Owner: kwolf@redhat.com +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/038 b/tests/qemu-iotests/038 index 2286c081d6..1ad0efd1a3 100755 --- a/tests/qemu-iotests/038 +++ b/tests/qemu-iotests/038 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dkwolf@redhat.com +# Creator/Owner: kwolf@redhat.com +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/039 b/tests/qemu-iotests/039 index cc1e7d74db..cf83895f23 100755 --- a/tests/qemu-iotests/039 +++ b/tests/qemu-iotests/039 @@ -20,9 +20,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dstefanha@linux.vnet.ibm.com +# Creator/Owner: stefanha@linux.vnet.ibm.com +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/040 b/tests/qemu-iotests/040 index 90b5b4f2ad..4466811195 100755 --- a/tests/qemu-iotests/040 +++ b/tests/qemu-iotests/040 @@ -20,6 +20,7 @@ # # Test for live block commit # Derived from Image Streaming Test 030 +# =20 import time import os diff --git a/tests/qemu-iotests/042 b/tests/qemu-iotests/042 index 45d533b7d9..db66fc8434 100755 --- a/tests/qemu-iotests/042 +++ b/tests/qemu-iotests/042 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dkwolf@redhat.com +# Creator/Owner: kwolf@redhat.com +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/043 b/tests/qemu-iotests/043 index b63073db37..7d106ddb3b 100755 --- a/tests/qemu-iotests/043 +++ b/tests/qemu-iotests/043 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dstefanha@redhat.com +# Creator/Owner: stefanha@redhat.com +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/046 b/tests/qemu-iotests/046 index 09192b25de..f6914ccd1e 100755 --- a/tests/qemu-iotests/046 +++ b/tests/qemu-iotests/046 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dkwolf@redhat.com +# Creator/Owner: kwolf@redhat.com +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/047 b/tests/qemu-iotests/047 index a11d212d44..474c5cb47d 100755 --- a/tests/qemu-iotests/047 +++ b/tests/qemu-iotests/047 @@ -18,9 +18,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dkwolf@redhat.com +# Creator/Owner: kwolf@redhat.com +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/048 b/tests/qemu-iotests/048 index f75cb4926e..531bed217c 100755 --- a/tests/qemu-iotests/048 +++ b/tests/qemu-iotests/048 @@ -19,8 +19,8 @@ ## along with this program. If not, see . ## # -# creator -owner=3Dmrezanin@redhat.com +# Creator/Owner: mrezanin@redhat.com +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/049 b/tests/qemu-iotests/049 index 20207a7023..2f4d8ab932 100755 --- a/tests/qemu-iotests/049 +++ b/tests/qemu-iotests/049 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dkwolf@redhat.com +# Creator/Owner: kwolf@redhat.com +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/050 b/tests/qemu-iotests/050 index 9d22200910..7096fa535c 100755 --- a/tests/qemu-iotests/050 +++ b/tests/qemu-iotests/050 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dpbonzini@redhat.com +# Creator/Owner: pbonzini@redhat.com +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/051 b/tests/qemu-iotests/051 index 0ad210c560..e726df6e01 100755 --- a/tests/qemu-iotests/051 +++ b/tests/qemu-iotests/051 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dkwolf@redhat.com +# Creator/Owner: kwolf@redhat.com +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/052 b/tests/qemu-iotests/052 index 3355094e3e..c521a6fc36 100755 --- a/tests/qemu-iotests/052 +++ b/tests/qemu-iotests/052 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dstefanha@redhat.com +# Creator/Owner: stefanha@redhat.com +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/053 b/tests/qemu-iotests/053 index 09e6a4f8bb..c8fda86672 100755 --- a/tests/qemu-iotests/053 +++ b/tests/qemu-iotests/053 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dstefanha@redhat.com +# Creator/Owner: stefanha@redhat.com +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/054 b/tests/qemu-iotests/054 index 46d0714881..bcea34ef86 100755 --- a/tests/qemu-iotests/054 +++ b/tests/qemu-iotests/054 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dkwolf@redhat.com +# Creator/Owner: kwolf@redhat.com +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/058 b/tests/qemu-iotests/058 index 34dcd10a58..17970357cd 100755 --- a/tests/qemu-iotests/058 +++ b/tests/qemu-iotests/058 @@ -19,9 +19,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dxiawenc@linux.vnet.ibm.com +# Creator/Owner: xiawenc@linux.vnet.ibm.com +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/059 b/tests/qemu-iotests/059 index 96883b78b9..6af6c6fada 100755 --- a/tests/qemu-iotests/059 +++ b/tests/qemu-iotests/059 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dfamz@redhat.com +# Creator/Owner: famz@redhat.com +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/060 b/tests/qemu-iotests/060 index 5775ec2871..d562b2c967 100755 --- a/tests/qemu-iotests/060 +++ b/tests/qemu-iotests/060 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dmreitz@redhat.com +# Creator/Owner: mreitz@redhat.com +# =20 seq=3D"$(basename $0)" echo "QA output created by $seq" diff --git a/tests/qemu-iotests/061 b/tests/qemu-iotests/061 index 2097d64fe4..ffc27213a5 100755 --- a/tests/qemu-iotests/061 +++ b/tests/qemu-iotests/061 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dmreitz@redhat.com +# Creator/Owner: mreitz@redhat.com +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/062 b/tests/qemu-iotests/062 index 6116453e30..4c6c3d70f4 100755 --- a/tests/qemu-iotests/062 +++ b/tests/qemu-iotests/062 @@ -18,9 +18,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dmreitz@redhat.com +# Creator/Owner: mreitz@redhat.com +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/063 b/tests/qemu-iotests/063 index fbffd6d9e7..29acdf3a8b 100755 --- a/tests/qemu-iotests/063 +++ b/tests/qemu-iotests/063 @@ -18,9 +18,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dalex@alex.org.uk +# Creator/Owner: alex@alex.org.uk +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/064 b/tests/qemu-iotests/064 index 3bfb46146a..0f220282c7 100755 --- a/tests/qemu-iotests/064 +++ b/tests/qemu-iotests/064 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Djcody@redhat.com +# Creator/Owner: jcody@redhat.com +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/066 b/tests/qemu-iotests/066 index f29fcc7eae..c8b0bee3be 100755 --- a/tests/qemu-iotests/066 +++ b/tests/qemu-iotests/066 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dmreitz@redhat.com +# Creator/Owner: mreitz@redhat.com +# =20 seq=3D"$(basename $0)" echo "QA output created by $seq" diff --git a/tests/qemu-iotests/067 b/tests/qemu-iotests/067 index cbc3180af0..976822b34c 100755 --- a/tests/qemu-iotests/067 +++ b/tests/qemu-iotests/067 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dkwolf@redhat.com +# Creator/Owner: kwolf@redhat.com +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/068 b/tests/qemu-iotests/068 index a0df34898e..dc00ee1c2d 100755 --- a/tests/qemu-iotests/068 +++ b/tests/qemu-iotests/068 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dmreitz@redhat.com +# Creator/Owner: mreitz@redhat.com +# =20 seq=3D"$(basename $0)" echo "QA output created by $seq" diff --git a/tests/qemu-iotests/069 b/tests/qemu-iotests/069 index e01cbc98f4..1d44ef37a1 100755 --- a/tests/qemu-iotests/069 +++ b/tests/qemu-iotests/069 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dmreitz@redhat.com +# Creator/Owner: mreitz@redhat.com +# =20 seq=3D"$(basename $0)" echo "QA output created by $seq" diff --git a/tests/qemu-iotests/070 b/tests/qemu-iotests/070 index 6cbe62e1a0..d52a85f624 100755 --- a/tests/qemu-iotests/070 +++ b/tests/qemu-iotests/070 @@ -18,9 +18,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Djcody@redhat.com +# Creator/Owner: jcody@redhat.com +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/071 b/tests/qemu-iotests/071 index 66806e3a8c..fd74238312 100755 --- a/tests/qemu-iotests/071 +++ b/tests/qemu-iotests/071 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dmreitz@redhat.com +# Creator/Owner: mreitz@redhat.com +# =20 seq=3D"$(basename $0)" echo "QA output created by $seq" diff --git a/tests/qemu-iotests/072 b/tests/qemu-iotests/072 index 2d28db91d5..568f8774d8 100755 --- a/tests/qemu-iotests/072 +++ b/tests/qemu-iotests/072 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dmreitz@redhat.com +# Creator/Owner: mreitz@redhat.com +# =20 seq=3D"$(basename $0)" echo "QA output created by $seq" diff --git a/tests/qemu-iotests/073 b/tests/qemu-iotests/073 index 2738010eb3..37e68263b4 100755 --- a/tests/qemu-iotests/073 +++ b/tests/qemu-iotests/073 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dkwolf@redhat.com +# Creator/Owner: kwolf@redhat.com +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/074 b/tests/qemu-iotests/074 index 0dcbe946da..d454580067 100755 --- a/tests/qemu-iotests/074 +++ b/tests/qemu-iotests/074 @@ -18,9 +18,8 @@ ## You should have received a copy of the GNU General Public License ## along with this program. If not, see . ## +## Creator/Owner: famz@redhat.com # -# creator -owner=3Dfamz@redhat.com =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/075 b/tests/qemu-iotests/075 index 2e819c2a5a..3e7ab6de95 100755 --- a/tests/qemu-iotests/075 +++ b/tests/qemu-iotests/075 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dstefanha@redhat.com +# Creator/Owner: stefanha@redhat.com +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/076 b/tests/qemu-iotests/076 index d7406739a1..df4a1614fb 100755 --- a/tests/qemu-iotests/076 +++ b/tests/qemu-iotests/076 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dkwolf@redhat.com +# Creator/Owner: kwolf@redhat.com +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/077 b/tests/qemu-iotests/077 index eb6a189bdf..8d4be8c1e8 100755 --- a/tests/qemu-iotests/077 +++ b/tests/qemu-iotests/077 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dkwolf@redhat.com +# Creator/Owner: kwolf@redhat.com +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/078 b/tests/qemu-iotests/078 index 1664c9c74c..b5f7c3a44a 100755 --- a/tests/qemu-iotests/078 +++ b/tests/qemu-iotests/078 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dkwolf@redhat.com +# Creator/Owner: kwolf@redhat.com +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/079 b/tests/qemu-iotests/079 index fc9de46cc7..3363e43146 100755 --- a/tests/qemu-iotests/079 +++ b/tests/qemu-iotests/079 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dhutao@cn.fujitsu.com +# Creator/Owner: hutao@cn.fujitsu.com +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/080 b/tests/qemu-iotests/080 index 0947ed0559..e7e7caf00d 100755 --- a/tests/qemu-iotests/080 +++ b/tests/qemu-iotests/080 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dkwolf@redhat.com +# Creator/Owner: kwolf@redhat.com +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/081 b/tests/qemu-iotests/081 index b067348fb2..33b18106c1 100755 --- a/tests/qemu-iotests/081 +++ b/tests/qemu-iotests/081 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dbenoit@irqsave.net +# Creator/Owner: benoit@irqsave.net +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/082 b/tests/qemu-iotests/082 index 64075693f3..fd904d69f8 100755 --- a/tests/qemu-iotests/082 +++ b/tests/qemu-iotests/082 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dkwolf@redhat.com +# Creator/Owner: kwolf@redhat.com +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/083 b/tests/qemu-iotests/083 index b724b6bf14..51fd8825b4 100755 --- a/tests/qemu-iotests/083 +++ b/tests/qemu-iotests/083 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dstefanha@redhat.com +# Creator/Owner: stefanha@redhat.com +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/084 b/tests/qemu-iotests/084 index 1a610e1ad4..333488a949 100755 --- a/tests/qemu-iotests/084 +++ b/tests/qemu-iotests/084 @@ -18,9 +18,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Djcody@redhat.com +# Creator/Owner: jcody@redhat.com +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/085 b/tests/qemu-iotests/085 index 12df84d6bc..da481225d6 100755 --- a/tests/qemu-iotests/085 +++ b/tests/qemu-iotests/085 @@ -22,9 +22,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Djcody@redhat.com +# Creator/Owner: jcody@redhat.com +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/086 b/tests/qemu-iotests/086 index 9329e14b62..8611514049 100755 --- a/tests/qemu-iotests/086 +++ b/tests/qemu-iotests/086 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dkwolf@redhat.com +# Creator/Owner: kwolf@redhat.com +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/087 b/tests/qemu-iotests/087 index 3e29e5f9fe..dd6e5976ca 100755 --- a/tests/qemu-iotests/087 +++ b/tests/qemu-iotests/087 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dkwolf@redhat.com +# Creator/Owner: kwolf@redhat.com +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/088 b/tests/qemu-iotests/088 index dcde4813d2..f6e1848ce9 100755 --- a/tests/qemu-iotests/088 +++ b/tests/qemu-iotests/088 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dkwolf@redhat.com +# Creator/Owner: kwolf@redhat.com +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/089 b/tests/qemu-iotests/089 index e1093f73c3..f925f5f245 100755 --- a/tests/qemu-iotests/089 +++ b/tests/qemu-iotests/089 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dmreitz@redhat.com +# Creator/Owner: mreitz@redhat.com +# =20 seq=3D"$(basename $0)" echo "QA output created by $seq" diff --git a/tests/qemu-iotests/090 b/tests/qemu-iotests/090 index f88b3a7992..2ae70f7d79 100755 --- a/tests/qemu-iotests/090 +++ b/tests/qemu-iotests/090 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dmreitz@redhat.com +# Creator/Owner: mreitz@redhat.com +# =20 seq=3D"$(basename $0)" echo "QA output created by $seq" diff --git a/tests/qemu-iotests/091 b/tests/qemu-iotests/091 index b1c5988c8a..48cf18d312 100755 --- a/tests/qemu-iotests/091 +++ b/tests/qemu-iotests/091 @@ -19,9 +19,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Djcody@redhat.com +# Creator/Owner: jcody@redhat.com +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/092 b/tests/qemu-iotests/092 index eb6064daeb..eeb039c7bd 100755 --- a/tests/qemu-iotests/092 +++ b/tests/qemu-iotests/092 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dkwolf@redhat.com +# Creator/Owner: kwolf@redhat.com +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/094 b/tests/qemu-iotests/094 index e8a07c195b..aa5faff5de 100755 --- a/tests/qemu-iotests/094 +++ b/tests/qemu-iotests/094 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dmreitz@redhat.com +# Creator/Owner: mreitz@redhat.com +# =20 seq=3D"$(basename $0)" echo "QA output created by $seq" diff --git a/tests/qemu-iotests/095 b/tests/qemu-iotests/095 index da0cc9fed2..fa17640c2c 100755 --- a/tests/qemu-iotests/095 +++ b/tests/qemu-iotests/095 @@ -21,8 +21,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # -# creator -owner=3Djcody@redhat.com +# Creator/Owner: jcody@redhat.com +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/097 b/tests/qemu-iotests/097 index 10aa13a0ce..2914da2da3 100755 --- a/tests/qemu-iotests/097 +++ b/tests/qemu-iotests/097 @@ -18,9 +18,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dmreitz@redhat.com +# Creator/Owner: mreitz@redhat.com +# =20 seq=3D"$(basename $0)" echo "QA output created by $seq" diff --git a/tests/qemu-iotests/098 b/tests/qemu-iotests/098 index 61c27f1f46..97f890dcf7 100755 --- a/tests/qemu-iotests/098 +++ b/tests/qemu-iotests/098 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dmreitz@redhat.com +# Creator/Owner: mreitz@redhat.com +# =20 seq=3D"$(basename $0)" echo "QA output created by $seq" diff --git a/tests/qemu-iotests/099 b/tests/qemu-iotests/099 index 90924c2ad2..8e8306d1e3 100755 --- a/tests/qemu-iotests/099 +++ b/tests/qemu-iotests/099 @@ -18,9 +18,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dmreitz@redhat.com +# Creator/Owner: mreitz@redhat.com +# =20 seq=3D"$(basename $0)" echo "QA output created by $seq" diff --git a/tests/qemu-iotests/101 b/tests/qemu-iotests/101 index 663038378b..38dace6aec 100755 --- a/tests/qemu-iotests/101 +++ b/tests/qemu-iotests/101 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dstefanha@redhat.com +# Creator/Owner: stefanha@redhat.com +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/102 b/tests/qemu-iotests/102 index 4ed1f77542..0fac4555b2 100755 --- a/tests/qemu-iotests/102 +++ b/tests/qemu-iotests/102 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dmreitz@redhat.com +# Creator/Owner: mreitz@redhat.com +# =20 seq=3D$(basename $0) echo "QA output created by $seq" diff --git a/tests/qemu-iotests/103 b/tests/qemu-iotests/103 index 0185cc73b2..55df533835 100755 --- a/tests/qemu-iotests/103 +++ b/tests/qemu-iotests/103 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dmreitz@redhat.com +# Creator/Owner: mreitz@redhat.com +# =20 seq=3D$(basename $0) echo "QA output created by $seq" diff --git a/tests/qemu-iotests/104 b/tests/qemu-iotests/104 index 869f6c5c09..903471346f 100755 --- a/tests/qemu-iotests/104 +++ b/tests/qemu-iotests/104 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dhutao@cn.fujitsu.com +# Creator/Owner: hutao@cn.fujitsu.com +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/105 b/tests/qemu-iotests/105 index 0f1c73eacd..68c6b732c2 100755 --- a/tests/qemu-iotests/105 +++ b/tests/qemu-iotests/105 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dfamz@redhat.com +# Creator/Owner: famz@redhat.com +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/106 b/tests/qemu-iotests/106 index 4adf5b8e74..9771198d70 100755 --- a/tests/qemu-iotests/106 +++ b/tests/qemu-iotests/106 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dmreitz@redhat.com +# Creator/Owner: mreitz@redhat.com +# =20 seq=3D$(basename $0) echo "QA output created by $seq" diff --git a/tests/qemu-iotests/107 b/tests/qemu-iotests/107 index 92c5854a80..7ddb27fbc9 100755 --- a/tests/qemu-iotests/107 +++ b/tests/qemu-iotests/107 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dmreitz@redhat.com +# Creator/Owner: mreitz@redhat.com +# =20 seq=3D"$(basename $0)" echo "QA output created by $seq" diff --git a/tests/qemu-iotests/108 b/tests/qemu-iotests/108 index d44fc8ae17..1284fc98d1 100755 --- a/tests/qemu-iotests/108 +++ b/tests/qemu-iotests/108 @@ -18,9 +18,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dmreitz@redhat.com +# Creator/Owner: mreitz@redhat.com +# =20 seq=3D"$(basename $0)" echo "QA output created by $seq" diff --git a/tests/qemu-iotests/109 b/tests/qemu-iotests/109 index 6bf5deb664..87985f66fb 100755 --- a/tests/qemu-iotests/109 +++ b/tests/qemu-iotests/109 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dkwolf@redhat.com +# Creator/Owner: kwolf@redhat.com +# =20 seq=3D"$(basename $0)" echo "QA output created by $seq" diff --git a/tests/qemu-iotests/110 b/tests/qemu-iotests/110 index ea8eecb3e7..0f62778f15 100755 --- a/tests/qemu-iotests/110 +++ b/tests/qemu-iotests/110 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dmreitz@redhat.com +# Creator/Owner: mreitz@redhat.com +# =20 seq=3D"$(basename $0)" echo "QA output created by $seq" diff --git a/tests/qemu-iotests/111 b/tests/qemu-iotests/111 index 73396468d4..85b6dd1746 100755 --- a/tests/qemu-iotests/111 +++ b/tests/qemu-iotests/111 @@ -18,9 +18,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dmreitz@redhat.com +# Creator/Owner: mreitz@redhat.com +# =20 seq=3D"$(basename $0)" echo "QA output created by $seq" diff --git a/tests/qemu-iotests/112 b/tests/qemu-iotests/112 index ac5745a559..5c4ecfeb4c 100755 --- a/tests/qemu-iotests/112 +++ b/tests/qemu-iotests/112 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dmreitz@redhat.com +# Creator/Owner: mreitz@redhat.com +# =20 seq=3D"$(basename $0)" echo "QA output created by $seq" diff --git a/tests/qemu-iotests/113 b/tests/qemu-iotests/113 index 69c2dab1bc..91af75d687 100755 --- a/tests/qemu-iotests/113 +++ b/tests/qemu-iotests/113 @@ -18,9 +18,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dmreitz@redhat.com +# Creator/Owner: mreitz@redhat.com +# =20 seq=3D"$(basename $0)" echo "QA output created by $seq" diff --git a/tests/qemu-iotests/114 b/tests/qemu-iotests/114 index a35f2baa61..66313cae91 100755 --- a/tests/qemu-iotests/114 +++ b/tests/qemu-iotests/114 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dkwolf@redhat.com +# Creator/Owner: kwolf@redhat.com +# =20 seq=3D"$(basename $0)" echo "QA output created by $seq" diff --git a/tests/qemu-iotests/115 b/tests/qemu-iotests/115 index cdd095bde2..2f06622e36 100755 --- a/tests/qemu-iotests/115 +++ b/tests/qemu-iotests/115 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dmreitz@redhat.com +# Creator/Owner: mreitz@redhat.com +# =20 seq=3D"$(basename $0)" echo "QA output created by $seq" diff --git a/tests/qemu-iotests/116 b/tests/qemu-iotests/116 index b5e962130b..7378c34bd6 100755 --- a/tests/qemu-iotests/116 +++ b/tests/qemu-iotests/116 @@ -20,9 +20,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dstefanha@redhat.com +# Creator/Owner: stefanha@redhat.com +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/117 b/tests/qemu-iotests/117 index 147d19053b..2ace2c9f89 100755 --- a/tests/qemu-iotests/117 +++ b/tests/qemu-iotests/117 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dmreitz@redhat.com +# Creator/Owner: mreitz@redhat.com +# =20 seq=3D"$(basename $0)" echo "QA output created by $seq" diff --git a/tests/qemu-iotests/119 b/tests/qemu-iotests/119 index d2342ff0bd..3df227748a 100755 --- a/tests/qemu-iotests/119 +++ b/tests/qemu-iotests/119 @@ -18,9 +18,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dmreitz@redhat.com +# Creator/Owner: mreitz@redhat.com +# =20 seq=3D"$(basename $0)" echo "QA output created by $seq" diff --git a/tests/qemu-iotests/120 b/tests/qemu-iotests/120 index 83bc551d16..0ce0a2c9cd 100755 --- a/tests/qemu-iotests/120 +++ b/tests/qemu-iotests/120 @@ -18,9 +18,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dmreitz@redhat.com +# Creator/Owner: mreitz@redhat.com +# =20 seq=3D"$(basename $0)" echo "QA output created by $seq" diff --git a/tests/qemu-iotests/121 b/tests/qemu-iotests/121 index 6c69c2beee..c6ce9e782a 100755 --- a/tests/qemu-iotests/121 +++ b/tests/qemu-iotests/121 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dmreitz@redhat.com +# Creator/Owner: mreitz@redhat.com +# =20 seq=3D"$(basename $0)" echo "QA output created by $seq" diff --git a/tests/qemu-iotests/122 b/tests/qemu-iotests/122 index 10104ea49a..e513b6abbf 100755 --- a/tests/qemu-iotests/122 +++ b/tests/qemu-iotests/122 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dkwolf@redhat.com +# Creator/Owner: kwolf@redhat.com +# =20 seq=3D"$(basename $0)" echo "QA output created by $seq" diff --git a/tests/qemu-iotests/123 b/tests/qemu-iotests/123 index 8f68a76ee4..9edcc4c8d2 100755 --- a/tests/qemu-iotests/123 +++ b/tests/qemu-iotests/123 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dmreitz@redhat.com +# Creator/Owner: mreitz@redhat.com +# =20 seq=3D"$(basename $0)" echo "QA output created by $seq" diff --git a/tests/qemu-iotests/125 b/tests/qemu-iotests/125 index 62a6d7fb1f..1a11496024 100755 --- a/tests/qemu-iotests/125 +++ b/tests/qemu-iotests/125 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dmreitz@redhat.com +# Creator/Owner: mreitz@redhat.com +# =20 seq=3D$(basename $0) echo "QA output created by $seq" diff --git a/tests/qemu-iotests/126 b/tests/qemu-iotests/126 index f3058e046a..73ed16a9af 100755 --- a/tests/qemu-iotests/126 +++ b/tests/qemu-iotests/126 @@ -18,9 +18,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dmreitz@redhat.com +# Creator/Owner: mreitz@redhat.com +# =20 seq=3D"$(basename $0)" echo "QA output created by $seq" diff --git a/tests/qemu-iotests/127 b/tests/qemu-iotests/127 index 34e1eddc57..ee7e3d365d 100755 --- a/tests/qemu-iotests/127 +++ b/tests/qemu-iotests/127 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dmreitz@redhat.com +# Creator/Owner: mreitz@redhat.com +# =20 seq=3D$(basename $0) echo "QA output created by $seq" diff --git a/tests/qemu-iotests/128 b/tests/qemu-iotests/128 index 934b6e7e33..412d4f86ca 100755 --- a/tests/qemu-iotests/128 +++ b/tests/qemu-iotests/128 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dstefanha@redhat.com +# Creator/Owner: stefanha@redhat.com +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/130 b/tests/qemu-iotests/130 index 4906019543..e5986d59bb 100755 --- a/tests/qemu-iotests/130 +++ b/tests/qemu-iotests/130 @@ -19,9 +19,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dkwolf@redhat.com +# Creator/Owner: kwolf@redhat.com +# =20 seq=3D"$(basename $0)" echo "QA output created by $seq" diff --git a/tests/qemu-iotests/131 b/tests/qemu-iotests/131 index fb771fed95..930a80e02f 100755 --- a/tests/qemu-iotests/131 +++ b/tests/qemu-iotests/131 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dden@openvz.org +# Creator/Owner: den@openvz.org +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/133 b/tests/qemu-iotests/133 index 1daf5895c1..61af222c9e 100755 --- a/tests/qemu-iotests/133 +++ b/tests/qemu-iotests/133 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dkwolf@redhat.com +# Creator/Owner: kwolf@redhat.com +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/134 b/tests/qemu-iotests/134 index 5d476e1b16..59f2662614 100755 --- a/tests/qemu-iotests/134 +++ b/tests/qemu-iotests/134 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dberrange@redhat.com +# Creator/Owner: berrange@redhat.com +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/135 b/tests/qemu-iotests/135 index 676e2a2c70..a6d35c147a 100755 --- a/tests/qemu-iotests/135 +++ b/tests/qemu-iotests/135 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Djcody@redhat.com +# Creator/Owner: jcody@redhat.com +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/137 b/tests/qemu-iotests/137 index 66ea0e9d1a..1c3981c982 100755 --- a/tests/qemu-iotests/137 +++ b/tests/qemu-iotests/137 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dkwolf@redhat.com +# Creator/Owner: kwolf@redhat.com +# =20 seq=3D"$(basename $0)" echo "QA output created by $seq" diff --git a/tests/qemu-iotests/138 b/tests/qemu-iotests/138 index 5624ef11db..4b21217038 100755 --- a/tests/qemu-iotests/138 +++ b/tests/qemu-iotests/138 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dmreitz@redhat.com +# Creator/Owner: mreitz@redhat.com +# =20 seq=3D"$(basename $0)" echo "QA output created by $seq" diff --git a/tests/qemu-iotests/140 b/tests/qemu-iotests/140 index a0d255ee5f..bdc1e08027 100755 --- a/tests/qemu-iotests/140 +++ b/tests/qemu-iotests/140 @@ -21,9 +21,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dmreitz@redhat.com +# Creator/Owner: mreitz@redhat.com +# =20 seq=3D"$(basename $0)" echo "QA output created by $seq" diff --git a/tests/qemu-iotests/141 b/tests/qemu-iotests/141 index 0bee4f8cde..c5e3981530 100755 --- a/tests/qemu-iotests/141 +++ b/tests/qemu-iotests/141 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dmreitz@redhat.com +# Creator/Owner: mreitz@redhat.com +# =20 seq=3D"$(basename $0)" echo "QA output created by $seq" diff --git a/tests/qemu-iotests/142 b/tests/qemu-iotests/142 index dca66f8675..6a8d6d8daa 100755 --- a/tests/qemu-iotests/142 +++ b/tests/qemu-iotests/142 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dkwolf@redhat.com +# Creator/Owner: kwolf@redhat.com +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/143 b/tests/qemu-iotests/143 index 2a8a1f044f..100d225e24 100755 --- a/tests/qemu-iotests/143 +++ b/tests/qemu-iotests/143 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dmreitz@redhat.com +# Creator/Owner: mreitz@redhat.com +# =20 seq=3D"$(basename $0)" echo "QA output created by $seq" diff --git a/tests/qemu-iotests/144 b/tests/qemu-iotests/144 index c12441a632..65fcfb77a6 100755 --- a/tests/qemu-iotests/144 +++ b/tests/qemu-iotests/144 @@ -19,9 +19,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Djcody@redhat.com +# Creator/Owner: jcody@redhat.com +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/145 b/tests/qemu-iotests/145 index cd02edd3a8..3fa205a07d 100755 --- a/tests/qemu-iotests/145 +++ b/tests/qemu-iotests/145 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dkwolf@redhat.com +# Creator/Owner: kwolf@redhat.com +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/146 b/tests/qemu-iotests/146 index 30fe5e07bc..6b418c60f7 100755 --- a/tests/qemu-iotests/146 +++ b/tests/qemu-iotests/146 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Djcody@redhat.com +# Creator/Owner: jcody@redhat.com +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/150 b/tests/qemu-iotests/150 index 6e77566d78..51e4e124cd 100755 --- a/tests/qemu-iotests/150 +++ b/tests/qemu-iotests/150 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dmreitz@redhat.com +# Creator/Owner: mreitz@redhat.com +# =20 seq=3D"$(basename $0)" echo "QA output created by $seq" diff --git a/tests/qemu-iotests/153 b/tests/qemu-iotests/153 index 6947b017f0..ae9158fa91 100755 --- a/tests/qemu-iotests/153 +++ b/tests/qemu-iotests/153 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dfamz@redhat.com +# Creator/Owner: famz@redhat.com +# =20 seq=3D"$(basename $0)" echo "QA output created by $seq" diff --git a/tests/qemu-iotests/154 b/tests/qemu-iotests/154 index d8f07422ca..7bf0c2e91e 100755 --- a/tests/qemu-iotests/154 +++ b/tests/qemu-iotests/154 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dkwolf@redhat.com +# Creator/Owner: kwolf@redhat.com +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/156 b/tests/qemu-iotests/156 index 907d5f4e42..62100fff7a 100755 --- a/tests/qemu-iotests/156 +++ b/tests/qemu-iotests/156 @@ -25,9 +25,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dmreitz@redhat.com +# Creator/Owner: mreitz@redhat.com +# =20 seq=3D"$(basename $0)" echo "QA output created by $seq" diff --git a/tests/qemu-iotests/157 b/tests/qemu-iotests/157 index 4f2e299008..2b2b886e99 100755 --- a/tests/qemu-iotests/157 +++ b/tests/qemu-iotests/157 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dkwolf@redhat.com +# Creator/Owner: kwolf@redhat.com +# =20 seq=3D"$(basename $0)" echo "QA output created by $seq" diff --git a/tests/qemu-iotests/158 b/tests/qemu-iotests/158 index 51c46dd259..fe3318bbe2 100755 --- a/tests/qemu-iotests/158 +++ b/tests/qemu-iotests/158 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dberrange@redhat.com +# Creator/Owner: berrange@redhat.com +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/159 b/tests/qemu-iotests/159 index 463228de96..799ff57040 100755 --- a/tests/qemu-iotests/159 +++ b/tests/qemu-iotests/159 @@ -17,8 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -owner=3Dfullmanet@gmail.com +# Creator/Owner: fullmanet@gmail.com +# =20 seq=3D"$(basename $0)" echo "QA output created by $seq" diff --git a/tests/qemu-iotests/160 b/tests/qemu-iotests/160 index ae6f799c9f..41ffad5774 100755 --- a/tests/qemu-iotests/160 +++ b/tests/qemu-iotests/160 @@ -17,8 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -owner=3Dfullmanet@gmail.com +# Creator/Owner: fullmanet@gmail.com +# =20 seq=3D"$(basename $0)" echo "QA output created by $seq" diff --git a/tests/qemu-iotests/162 b/tests/qemu-iotests/162 index 0572e91c9a..6cadc0c75b 100755 --- a/tests/qemu-iotests/162 +++ b/tests/qemu-iotests/162 @@ -18,9 +18,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dmreitz@redhat.com +# Creator/Owner: mreitz@redhat.com +# =20 seq=3D"$(basename $0)" echo "QA output created by $seq" diff --git a/tests/qemu-iotests/170 b/tests/qemu-iotests/170 index 9454485e52..736c61f8e9 100755 --- a/tests/qemu-iotests/170 +++ b/tests/qemu-iotests/170 @@ -17,8 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -owner=3Dfullmanet@gmail.com +# Creator/Owner: fullmanet@gmail.com +# =20 seq=3D"$(basename $0)" echo "QA output created by $seq" diff --git a/tests/qemu-iotests/171 b/tests/qemu-iotests/171 index 2c6d6e4995..3ea97f46b6 100755 --- a/tests/qemu-iotests/171 +++ b/tests/qemu-iotests/171 @@ -18,9 +18,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dtgolembi@redhat.com +# Creator/Owner: tgolembi@redhat.com +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/172 b/tests/qemu-iotests/172 index 0b63d0b116..2fd80c7844 100755 --- a/tests/qemu-iotests/172 +++ b/tests/qemu-iotests/172 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dkwolf@redhat.com +# Creator/Owner: kwolf@redhat.com +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/173 b/tests/qemu-iotests/173 index f08f4d93d1..0df1865199 100755 --- a/tests/qemu-iotests/173 +++ b/tests/qemu-iotests/173 @@ -18,8 +18,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # -# creator -owner=3Djcody@redhat.com +# Creator/Owner: jcody@redhat.com +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/174 b/tests/qemu-iotests/174 index 46f557402f..2c530a1e64 100755 --- a/tests/qemu-iotests/174 +++ b/tests/qemu-iotests/174 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dnirsof@gmail.com +# Creator/Owner: nirsof@gmail.com +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/175 b/tests/qemu-iotests/175 index d96ac79b04..a000405737 100755 --- a/tests/qemu-iotests/175 +++ b/tests/qemu-iotests/175 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dnirsof@gmail.com +# Creator/Owner: nirsof@gmail.com +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/176 b/tests/qemu-iotests/176 index b0f87e4bf4..9928833137 100755 --- a/tests/qemu-iotests/176 +++ b/tests/qemu-iotests/176 @@ -21,9 +21,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dmreitz@redhat.com +# Creator/Owner: mreitz@redhat.com +# =20 seq=3D"$(basename $0)" echo "QA output created by $seq" diff --git a/tests/qemu-iotests/177 b/tests/qemu-iotests/177 index 3afad516da..2c0c70ec6d 100755 --- a/tests/qemu-iotests/177 +++ b/tests/qemu-iotests/177 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Deblake@redhat.com +# Creator/Owner: eblake@redhat.com +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/178 b/tests/qemu-iotests/178 index 875b4e002b..ffa3d3148b 100755 --- a/tests/qemu-iotests/178 +++ b/tests/qemu-iotests/178 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dstefanha@redhat.com +# Creator/Owner: stefanha@redhat.com +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/179 b/tests/qemu-iotests/179 index 45f82a1a2d..ccede3bc04 100755 --- a/tests/qemu-iotests/179 +++ b/tests/qemu-iotests/179 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Deblake@redhat.com +# Creator/Owner: eblake@redhat.com +# =20 seq=3D"$(basename $0)" echo "QA output created by $seq" diff --git a/tests/qemu-iotests/181 b/tests/qemu-iotests/181 index c0254623b1..b308c8194f 100755 --- a/tests/qemu-iotests/181 +++ b/tests/qemu-iotests/181 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dkwolf@redhat.com +# Creator/Owner: kwolf@redhat.com +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/182 b/tests/qemu-iotests/182 index 4fbc1d95f9..c7cd4ff678 100755 --- a/tests/qemu-iotests/182 +++ b/tests/qemu-iotests/182 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dfamz@redhat.com +# Creator/Owner: famz@redhat.com +# =20 seq=3D"$(basename $0)" echo "QA output created by $seq" diff --git a/tests/qemu-iotests/183 b/tests/qemu-iotests/183 index 320d03e6f6..764632c16b 100755 --- a/tests/qemu-iotests/183 +++ b/tests/qemu-iotests/183 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dkwolf@redhat.com +# Creator/Owner: kwolf@redhat.com +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/184 b/tests/qemu-iotests/184 index e2af0660c7..1b2859de5a 100755 --- a/tests/qemu-iotests/184 +++ b/tests/qemu-iotests/184 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3D"Manos Pitsidianakis" +# Creator/Owner: Manos Pitsidianakis +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/185 b/tests/qemu-iotests/185 index 7ba20c9eb7..563ae366fd 100755 --- a/tests/qemu-iotests/185 +++ b/tests/qemu-iotests/185 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dkwolf@redhat.com +# Creator/Owner: kwolf@redhat.com +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/186 b/tests/qemu-iotests/186 index c7e28d4435..3d52508452 100755 --- a/tests/qemu-iotests/186 +++ b/tests/qemu-iotests/186 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dkwolf@redhat.com +# Creator/Owner: kwolf@redhat.com +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/187 b/tests/qemu-iotests/187 index a53d2637e0..4351702784 100755 --- a/tests/qemu-iotests/187 +++ b/tests/qemu-iotests/187 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dkwolf@redhat.com +# Creator/Owner: kwolf@redhat.com +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/188 b/tests/qemu-iotests/188 index ba523e0b50..042bf96178 100755 --- a/tests/qemu-iotests/188 +++ b/tests/qemu-iotests/188 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dberrange@redhat.com +# Creator/Owner: berrange@redhat.com +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/189 b/tests/qemu-iotests/189 index a2f62fc520..9108495d99 100755 --- a/tests/qemu-iotests/189 +++ b/tests/qemu-iotests/189 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dberrange@redhat.com +# Creator/Owner: berrange@redhat.com +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/190 b/tests/qemu-iotests/190 index 0a848a6c94..aceba63b49 100755 --- a/tests/qemu-iotests/190 +++ b/tests/qemu-iotests/190 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Deblake@redhat.com +# Creator/Owner: eblake@redhat.com +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/191 b/tests/qemu-iotests/191 index b29822c9c3..25d94211d9 100755 --- a/tests/qemu-iotests/191 +++ b/tests/qemu-iotests/191 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dkwolf@redhat.com +# Creator/Owner: kwolf@redhat.com +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/192 b/tests/qemu-iotests/192 index 4bf2ea2757..37fbb71cd0 100755 --- a/tests/qemu-iotests/192 +++ b/tests/qemu-iotests/192 @@ -18,9 +18,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dfamz@redhat.com +# Creator/Owner: famz@redhat.com +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/195 b/tests/qemu-iotests/195 index 31135ac290..248cf90f53 100755 --- a/tests/qemu-iotests/195 +++ b/tests/qemu-iotests/195 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Dkwolf@redhat.com +# Creator/Owner: kwolf@redhat.com +# =20 seq=3D`basename $0` echo "QA output created by $seq" diff --git a/tests/qemu-iotests/197 b/tests/qemu-iotests/197 index 0f7361611f..9fb4a694a1 100755 --- a/tests/qemu-iotests/197 +++ b/tests/qemu-iotests/197 @@ -17,9 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - -# creator -owner=3Deblake@redhat.com +# Creator/Owner: eblake@redhat.com +# =20 seq=3D"$(basename $0)" echo "QA output created by $seq" --=20 2.13.6 From nobody Sat May 4 14:04:10 2024 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; 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 15108542404121008.3238711909671; Thu, 16 Nov 2017 09:44:00 -0800 (PST) Received: from localhost ([::1]:42161 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eFOCX-0003Fa-AK for importer@patchew.org; Thu, 16 Nov 2017 12:43:45 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59964) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eFO7o-0007iA-JX for qemu-devel@nongnu.org; Thu, 16 Nov 2017 12:38:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eFO7i-0003e6-AV for qemu-devel@nongnu.org; Thu, 16 Nov 2017 12:38:52 -0500 Received: from mx1.redhat.com ([209.132.183.28]:53226) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eFO7S-0002xU-Dl; Thu, 16 Nov 2017 12:38:30 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 903C5C047B89; Thu, 16 Nov 2017 17:38:29 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-120-124.rdu2.redhat.com [10.10.120.124]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C3A48614D0; Thu, 16 Nov 2017 17:38:28 +0000 (UTC) From: Cleber Rosa To: qemu-devel@nongnu.org Date: Thu, 16 Nov 2017 12:38:07 -0500 Message-Id: <20171116173810.16457-8-crosa@redhat.com> In-Reply-To: <20171116173810.16457-1-crosa@redhat.com> References: <20171116173810.16457-1-crosa@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Thu, 16 Nov 2017 17:38:29 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 07/10] qemu-iotests: remove the concept of $seq.full (and boiler plate code) 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: Kevin Wolf , Cleber Rosa , qemu-block@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The $seq.full file, in theory, should contain the full output of a test error. In practice, it's only used on a single test, and the boiler plate code to clean it up plagues all other tests. Let's remove the concept altogether, and record the failure in the output itself for the one test using this function. Signed-off-by: Cleber Rosa --- tests/qemu-iotests/001 | 1 - tests/qemu-iotests/002 | 1 - tests/qemu-iotests/003 | 1 - tests/qemu-iotests/004 | 1 - tests/qemu-iotests/005 | 1 - tests/qemu-iotests/007 | 1 - tests/qemu-iotests/008 | 1 - tests/qemu-iotests/009 | 1 - tests/qemu-iotests/010 | 1 - tests/qemu-iotests/011 | 1 - tests/qemu-iotests/012 | 1 - tests/qemu-iotests/013 | 1 - tests/qemu-iotests/014 | 1 - tests/qemu-iotests/015 | 1 - tests/qemu-iotests/017 | 1 - tests/qemu-iotests/018 | 1 - tests/qemu-iotests/019 | 1 - tests/qemu-iotests/020 | 1 - tests/qemu-iotests/021 | 1 - tests/qemu-iotests/022 | 1 - tests/qemu-iotests/023 | 1 - tests/qemu-iotests/024 | 1 - tests/qemu-iotests/025 | 1 - tests/qemu-iotests/026 | 1 - tests/qemu-iotests/027 | 1 - tests/qemu-iotests/028 | 1 - tests/qemu-iotests/029 | 1 - tests/qemu-iotests/031 | 1 - tests/qemu-iotests/032 | 1 - tests/qemu-iotests/033 | 1 - tests/qemu-iotests/034 | 1 - tests/qemu-iotests/035 | 1 - tests/qemu-iotests/036 | 1 - tests/qemu-iotests/037 | 1 - tests/qemu-iotests/038 | 1 - tests/qemu-iotests/039 | 1 - tests/qemu-iotests/042 | 1 - tests/qemu-iotests/043 | 1 - tests/qemu-iotests/046 | 1 - tests/qemu-iotests/047 | 1 - tests/qemu-iotests/049 | 1 - tests/qemu-iotests/050 | 1 - tests/qemu-iotests/051 | 1 - tests/qemu-iotests/052 | 1 - tests/qemu-iotests/053 | 1 - tests/qemu-iotests/054 | 1 - tests/qemu-iotests/058 | 1 - tests/qemu-iotests/059 | 1 - tests/qemu-iotests/060 | 1 - tests/qemu-iotests/061 | 1 - tests/qemu-iotests/062 | 1 - tests/qemu-iotests/063 | 1 - tests/qemu-iotests/064 | 1 - tests/qemu-iotests/066 | 1 - tests/qemu-iotests/067 | 1 - tests/qemu-iotests/068 | 1 - tests/qemu-iotests/069 | 1 - tests/qemu-iotests/070 | 1 - tests/qemu-iotests/071 | 1 - tests/qemu-iotests/072 | 1 - tests/qemu-iotests/073 | 1 - tests/qemu-iotests/075 | 1 - tests/qemu-iotests/076 | 1 - tests/qemu-iotests/077 | 1 - tests/qemu-iotests/078 | 1 - tests/qemu-iotests/079 | 1 - tests/qemu-iotests/080 | 1 - tests/qemu-iotests/081 | 1 - tests/qemu-iotests/082 | 1 - tests/qemu-iotests/083 | 1 - tests/qemu-iotests/084 | 1 - tests/qemu-iotests/085 | 1 - tests/qemu-iotests/086 | 1 - tests/qemu-iotests/087 | 1 - tests/qemu-iotests/088 | 1 - tests/qemu-iotests/089 | 1 - tests/qemu-iotests/090 | 1 - tests/qemu-iotests/091 | 1 - tests/qemu-iotests/092 | 1 - tests/qemu-iotests/094 | 1 - tests/qemu-iotests/095 | 1 - tests/qemu-iotests/097 | 1 - tests/qemu-iotests/098 | 1 - tests/qemu-iotests/099 | 1 - tests/qemu-iotests/101 | 1 - tests/qemu-iotests/102 | 1 - tests/qemu-iotests/103 | 1 - tests/qemu-iotests/104 | 1 - tests/qemu-iotests/105 | 1 - tests/qemu-iotests/106 | 1 - tests/qemu-iotests/107 | 1 - tests/qemu-iotests/108 | 1 - tests/qemu-iotests/109 | 1 - tests/qemu-iotests/110 | 1 - tests/qemu-iotests/111 | 1 - tests/qemu-iotests/112 | 1 - tests/qemu-iotests/113 | 1 - tests/qemu-iotests/114 | 1 - tests/qemu-iotests/115 | 1 - tests/qemu-iotests/116 | 1 - tests/qemu-iotests/117 | 1 - tests/qemu-iotests/119 | 1 - tests/qemu-iotests/120 | 1 - tests/qemu-iotests/121 | 1 - tests/qemu-iotests/122 | 1 - tests/qemu-iotests/123 | 1 - tests/qemu-iotests/125 | 1 - tests/qemu-iotests/126 | 1 - tests/qemu-iotests/127 | 1 - tests/qemu-iotests/128 | 1 - tests/qemu-iotests/130 | 1 - tests/qemu-iotests/131 | 1 - tests/qemu-iotests/133 | 1 - tests/qemu-iotests/134 | 1 - tests/qemu-iotests/135 | 1 - tests/qemu-iotests/137 | 1 - tests/qemu-iotests/138 | 1 - tests/qemu-iotests/140 | 1 - tests/qemu-iotests/141 | 1 - tests/qemu-iotests/142 | 1 - tests/qemu-iotests/143 | 1 - tests/qemu-iotests/144 | 1 - tests/qemu-iotests/145 | 1 - tests/qemu-iotests/146 | 1 - tests/qemu-iotests/150 | 1 - tests/qemu-iotests/153 | 1 - tests/qemu-iotests/154 | 1 - tests/qemu-iotests/156 | 1 - tests/qemu-iotests/157 | 1 - tests/qemu-iotests/158 | 1 - tests/qemu-iotests/162 | 1 - tests/qemu-iotests/171 | 1 - tests/qemu-iotests/172 | 1 - tests/qemu-iotests/173 | 1 - tests/qemu-iotests/174 | 9 +++++++-- tests/qemu-iotests/175 | 1 - tests/qemu-iotests/176 | 1 - tests/qemu-iotests/178 | 1 - tests/qemu-iotests/181 | 1 - tests/qemu-iotests/182 | 1 - tests/qemu-iotests/183 | 1 - tests/qemu-iotests/184 | 1 - tests/qemu-iotests/185 | 1 - tests/qemu-iotests/186 | 1 - tests/qemu-iotests/187 | 1 - tests/qemu-iotests/188 | 1 - tests/qemu-iotests/189 | 1 - tests/qemu-iotests/190 | 1 - tests/qemu-iotests/191 | 1 - tests/qemu-iotests/192 | 1 - tests/qemu-iotests/195 | 1 - 151 files changed, 7 insertions(+), 152 deletions(-) diff --git a/tests/qemu-iotests/001 b/tests/qemu-iotests/001 index b38fb0c73d..5830f68ba0 100755 --- a/tests/qemu-iotests/001 +++ b/tests/qemu-iotests/001 @@ -58,5 +58,4 @@ $QEMU_IO -c "read -P 0xa 0 $size" "$TEST_IMG" | _filter_q= emu_io =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/002 b/tests/qemu-iotests/002 index 608d62652a..7dd1774464 100755 --- a/tests/qemu-iotests/002 +++ b/tests/qemu-iotests/002 @@ -78,5 +78,4 @@ $QEMU_IO -c 'read -pP 0xa 262186 470' "$TEST_IMG" | _filt= er_qemu_io =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/003 b/tests/qemu-iotests/003 index 68beb32aea..13cc8041a3 100755 --- a/tests/qemu-iotests/003 +++ b/tests/qemu-iotests/003 @@ -71,5 +71,4 @@ $QEMU_IO -c "readv -P 0xb $offset $chunksize $chunksize \ =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/004 b/tests/qemu-iotests/004 index 5afb23c9fd..710148c2bb 100755 --- a/tests/qemu-iotests/004 +++ b/tests/qemu-iotests/004 @@ -97,5 +97,4 @@ $QEMU_IO -c "readv $past_offset 4096" "$TEST_IMG" =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/005 b/tests/qemu-iotests/005 index a860062847..d2c6575992 100755 --- a/tests/qemu-iotests/005 +++ b/tests/qemu-iotests/005 @@ -68,5 +68,4 @@ $QEMU_IO -c "write 8192 4096" "$TEST_IMG" | _filter_qemu_= io =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/007 b/tests/qemu-iotests/007 index f9048f9a7a..3fe2fe5dad 100755 --- a/tests/qemu-iotests/007 +++ b/tests/qemu-iotests/007 @@ -62,5 +62,4 @@ _check_test_img =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/008 b/tests/qemu-iotests/008 index 7755c00a43..f021b8ea3a 100755 --- a/tests/qemu-iotests/008 +++ b/tests/qemu-iotests/008 @@ -58,5 +58,4 @@ $QEMU_IO -c "aio_read -P 0xa 0 $size" "$TEST_IMG" | _filt= er_qemu_io =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/009 b/tests/qemu-iotests/009 index 418c0a56f7..8d56673bc6 100755 --- a/tests/qemu-iotests/009 +++ b/tests/qemu-iotests/009 @@ -62,5 +62,4 @@ _check_test_img =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/010 b/tests/qemu-iotests/010 index 6e9beb953d..3f91224795 100755 --- a/tests/qemu-iotests/010 +++ b/tests/qemu-iotests/010 @@ -64,5 +64,4 @@ _check_test_img =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/011 b/tests/qemu-iotests/011 index 275b0cc29c..921f43c03d 100755 --- a/tests/qemu-iotests/011 +++ b/tests/qemu-iotests/011 @@ -68,5 +68,4 @@ _check_test_img =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/012 b/tests/qemu-iotests/012 index 59cac183e2..3121f947f6 100755 --- a/tests/qemu-iotests/012 +++ b/tests/qemu-iotests/012 @@ -58,5 +58,4 @@ $QEMU_IO -r -c "read 0 512" "$TEST_IMG" | _filter_qemu_io =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/013 b/tests/qemu-iotests/013 index d33969be6a..095c2a0cd6 100755 --- a/tests/qemu-iotests/013 +++ b/tests/qemu-iotests/013 @@ -91,5 +91,4 @@ done =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/014 b/tests/qemu-iotests/014 index 360379f2b3..c28970732b 100755 --- a/tests/qemu-iotests/014 +++ b/tests/qemu-iotests/014 @@ -70,5 +70,4 @@ done =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/015 b/tests/qemu-iotests/015 index c1b920fd56..a5cda4742c 100755 --- a/tests/qemu-iotests/015 +++ b/tests/qemu-iotests/015 @@ -80,5 +80,4 @@ _check_test_img =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/017 b/tests/qemu-iotests/017 index b2a95c5166..2398fc2bf1 100755 --- a/tests/qemu-iotests/017 +++ b/tests/qemu-iotests/017 @@ -98,5 +98,4 @@ _check_test_img =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/018 b/tests/qemu-iotests/018 index 5375eae206..8d4ccda85e 100755 --- a/tests/qemu-iotests/018 +++ b/tests/qemu-iotests/018 @@ -100,5 +100,4 @@ _check_test_img =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/019 b/tests/qemu-iotests/019 index c2af8a0236..b06ef93976 100755 --- a/tests/qemu-iotests/019 +++ b/tests/qemu-iotests/019 @@ -126,5 +126,4 @@ done =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/020 b/tests/qemu-iotests/020 index 0361809a6d..b34cfc16e1 100755 --- a/tests/qemu-iotests/020 +++ b/tests/qemu-iotests/020 @@ -111,5 +111,4 @@ _check_test_img =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/021 b/tests/qemu-iotests/021 index 2ea6b1d161..97e27d6cf3 100755 --- a/tests/qemu-iotests/021 +++ b/tests/qemu-iotests/021 @@ -56,5 +56,4 @@ done =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/022 b/tests/qemu-iotests/022 index f577278db9..bc9186c0fa 100755 --- a/tests/qemu-iotests/022 +++ b/tests/qemu-iotests/022 @@ -60,5 +60,4 @@ done =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/023 b/tests/qemu-iotests/023 index ca8440ad83..99fda1ff14 100755 --- a/tests/qemu-iotests/023 +++ b/tests/qemu-iotests/023 @@ -113,5 +113,4 @@ done =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/024 b/tests/qemu-iotests/024 index 189d5c3fc1..b3cabe1fb5 100755 --- a/tests/qemu-iotests/024 +++ b/tests/qemu-iotests/024 @@ -124,5 +124,4 @@ io_pattern readv $((15 * CLUSTER_SIZE)) $CLUSTER_SIZE 0= 1 0x00 =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/025 b/tests/qemu-iotests/025 index eb12d1c7d6..a781632b09 100755 --- a/tests/qemu-iotests/025 +++ b/tests/qemu-iotests/025 @@ -71,5 +71,4 @@ io_pattern read $small_size $(($big_size - $small_size)) = 0 1 0 =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/026 b/tests/qemu-iotests/026 index 3fb915f289..166c8267f7 100755 --- a/tests/qemu-iotests/026 +++ b/tests/qemu-iotests/026 @@ -200,5 +200,4 @@ done =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/027 b/tests/qemu-iotests/027 index 9a25a63c28..c9416c719f 100755 --- a/tests/qemu-iotests/027 +++ b/tests/qemu-iotests/027 @@ -71,5 +71,4 @@ $QEMU_IO -c "read -pP 0 -l 512 -s $subcluster_size $subcl= uster_offset $(( subclu =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/028 b/tests/qemu-iotests/028 index e75611bab3..f2991a28aa 100755 --- a/tests/qemu-iotests/028 +++ b/tests/qemu-iotests/028 @@ -134,5 +134,4 @@ _check_test_img =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/029 b/tests/qemu-iotests/029 index 01ed075402..fee694f305 100755 --- a/tests/qemu-iotests/029 +++ b/tests/qemu-iotests/029 @@ -95,5 +95,4 @@ poke_file "$TEST_IMG" "$offset_l1_size" "\x00\x00\x00\x01" =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/031 b/tests/qemu-iotests/031 index 1ac200f191..da44539b0f 100755 --- a/tests/qemu-iotests/031 +++ b/tests/qemu-iotests/031 @@ -73,5 +73,4 @@ done =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/032 b/tests/qemu-iotests/032 index c9f9cf5439..15a0ff6298 100755 --- a/tests/qemu-iotests/032 +++ b/tests/qemu-iotests/032 @@ -62,5 +62,4 @@ _check_test_img =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/033 b/tests/qemu-iotests/033 index dd8fc32ea8..d4beecc9c0 100755 --- a/tests/qemu-iotests/033 +++ b/tests/qemu-iotests/033 @@ -102,5 +102,4 @@ done =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/034 b/tests/qemu-iotests/034 index 1bdd7f2e04..c0eb87b40a 100755 --- a/tests/qemu-iotests/034 +++ b/tests/qemu-iotests/034 @@ -113,5 +113,4 @@ $QEMU_IO -c "read -P 0x55 526k 498k" "$TEST_IMG" | _fil= ter_qemu_io =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/035 b/tests/qemu-iotests/035 index 1cd2475ba6..04c4cf0f58 100755 --- a/tests/qemu-iotests/035 +++ b/tests/qemu-iotests/035 @@ -65,5 +65,4 @@ _check_test_img =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/036 b/tests/qemu-iotests/036 index e49e4a7f85..990b9d82b6 100755 --- a/tests/qemu-iotests/036 +++ b/tests/qemu-iotests/036 @@ -114,5 +114,4 @@ $PYTHON qcow2.py "$TEST_IMG" dump-header =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/037 b/tests/qemu-iotests/037 index 06ba02a9f9..c4d55babe2 100755 --- a/tests/qemu-iotests/037 +++ b/tests/qemu-iotests/037 @@ -118,5 +118,4 @@ _check_test_img =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/038 b/tests/qemu-iotests/038 index 1ad0efd1a3..b35c30fa17 100755 --- a/tests/qemu-iotests/038 +++ b/tests/qemu-iotests/038 @@ -130,5 +130,4 @@ _check_test_img =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/039 b/tests/qemu-iotests/039 index cf83895f23..99a33df803 100755 --- a/tests/qemu-iotests/039 +++ b/tests/qemu-iotests/039 @@ -174,6 +174,5 @@ _check_test_img =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 =20 diff --git a/tests/qemu-iotests/042 b/tests/qemu-iotests/042 index db66fc8434..7fafb6a436 100755 --- a/tests/qemu-iotests/042 +++ b/tests/qemu-iotests/042 @@ -70,6 +70,5 @@ _check_test_img =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 =20 diff --git a/tests/qemu-iotests/043 b/tests/qemu-iotests/043 index 7d106ddb3b..0ce07adfd0 100755 --- a/tests/qemu-iotests/043 +++ b/tests/qemu-iotests/043 @@ -88,5 +88,4 @@ _img_info --backing-chain --output=3Djson =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/046 b/tests/qemu-iotests/046 index f6914ccd1e..c3c16ebd3d 100755 --- a/tests/qemu-iotests/046 +++ b/tests/qemu-iotests/046 @@ -265,5 +265,4 @@ _check_test_img =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/047 b/tests/qemu-iotests/047 index 474c5cb47d..ebbb36c349 100755 --- a/tests/qemu-iotests/047 +++ b/tests/qemu-iotests/047 @@ -68,5 +68,4 @@ _check_test_img =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/049 b/tests/qemu-iotests/049 index 2f4d8ab932..984652cd97 100755 --- a/tests/qemu-iotests/049 +++ b/tests/qemu-iotests/049 @@ -116,5 +116,4 @@ test_qemu_img create -f $IMGFMT -o compat=3D0.10,lazy_r= efcounts=3Don "$TEST_IMG" 64M =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/050 b/tests/qemu-iotests/050 index 7096fa535c..f290c68498 100755 --- a/tests/qemu-iotests/050 +++ b/tests/qemu-iotests/050 @@ -73,5 +73,4 @@ $QEMU_IO -c "read -P 0x00 0 1048576" "$TEST_IMG" | _filte= r_qemu_io =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/051 b/tests/qemu-iotests/051 index e726df6e01..b6903d13c4 100755 --- a/tests/qemu-iotests/051 +++ b/tests/qemu-iotests/051 @@ -341,5 +341,4 @@ $QEMU_IO -c "read -P 0x33 0 4k" "$TEST_IMG" | _filter_q= emu_io =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/052 b/tests/qemu-iotests/052 index c521a6fc36..33c3e55713 100755 --- a/tests/qemu-iotests/052 +++ b/tests/qemu-iotests/052 @@ -60,5 +60,4 @@ $QEMU_IO -c "read -P 0 0 $size" "$TEST_IMG" | _filter_qem= u_io =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/053 b/tests/qemu-iotests/053 index c8fda86672..a84dde31e0 100755 --- a/tests/qemu-iotests/053 +++ b/tests/qemu-iotests/053 @@ -65,6 +65,5 @@ $QEMU_IO -c "read -P0xa 0 512" "$TEST_IMG" | _filter_qemu= _io =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 =20 diff --git a/tests/qemu-iotests/054 b/tests/qemu-iotests/054 index bcea34ef86..0fc2a8faa6 100755 --- a/tests/qemu-iotests/054 +++ b/tests/qemu-iotests/054 @@ -51,5 +51,4 @@ _check_test_img =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/058 b/tests/qemu-iotests/058 index 17970357cd..74118b93d3 100755 --- a/tests/qemu-iotests/058 +++ b/tests/qemu-iotests/058 @@ -141,5 +141,4 @@ $QEMU_IO -c 'read -P 0xb 0x2000 0x1000' "$converted_ima= ge" | _filter_qemu_io =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/059 b/tests/qemu-iotests/059 index 6af6c6fada..fe16e9442d 100755 --- a/tests/qemu-iotests/059 +++ b/tests/qemu-iotests/059 @@ -155,5 +155,4 @@ _cleanup_test_img =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/060 b/tests/qemu-iotests/060 index d562b2c967..98a946f99c 100755 --- a/tests/qemu-iotests/060 +++ b/tests/qemu-iotests/060 @@ -301,5 +301,4 @@ $QEMU_IO -c "write 0 64k" "$TEST_IMG" | _filter_qemu_io =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/061 b/tests/qemu-iotests/061 index ffc27213a5..2c6da49646 100755 --- a/tests/qemu-iotests/061 +++ b/tests/qemu-iotests/061 @@ -235,5 +235,4 @@ _check_test_img =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/062 b/tests/qemu-iotests/062 index 4c6c3d70f4..3f97c7d6da 100755 --- a/tests/qemu-iotests/062 +++ b/tests/qemu-iotests/062 @@ -57,5 +57,4 @@ _check_test_img =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/063 b/tests/qemu-iotests/063 index 29acdf3a8b..9b8660e021 100755 --- a/tests/qemu-iotests/063 +++ b/tests/qemu-iotests/063 @@ -90,6 +90,5 @@ if $QEMU_IMG convert -f $IMGFMT -O $IMGFMT -n "$TEST_IMG.= orig" "$TEST_IMG" >/dev fi =20 echo "*** done" -rm -f $seq.full status=3D0 exit 0 diff --git a/tests/qemu-iotests/064 b/tests/qemu-iotests/064 index 0f220282c7..40954b36d7 100755 --- a/tests/qemu-iotests/064 +++ b/tests/qemu-iotests/064 @@ -81,5 +81,4 @@ $QEMU_IO -c "read -pP 0xc3 99M 58M" "$TEST_IMG" | _filter= _qemu_io =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/066 b/tests/qemu-iotests/066 index c8b0bee3be..556b42bfe6 100755 --- a/tests/qemu-iotests/066 +++ b/tests/qemu-iotests/066 @@ -184,5 +184,4 @@ _cleanup_test_img =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/067 b/tests/qemu-iotests/067 index 976822b34c..b7a6ef2097 100755 --- a/tests/qemu-iotests/067 +++ b/tests/qemu-iotests/067 @@ -150,5 +150,4 @@ EOF =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/068 b/tests/qemu-iotests/068 index dc00ee1c2d..162cd26005 100755 --- a/tests/qemu-iotests/068 +++ b/tests/qemu-iotests/068 @@ -81,5 +81,4 @@ done =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/069 b/tests/qemu-iotests/069 index 1d44ef37a1..1f3baeea13 100755 --- a/tests/qemu-iotests/069 +++ b/tests/qemu-iotests/069 @@ -53,5 +53,4 @@ $QEMU_IO -c quit "$TEST_IMG" 2>&1 | _filter_testdir | _fi= lter_imgfmt =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/070 b/tests/qemu-iotests/070 index d52a85f624..684742893c 100755 --- a/tests/qemu-iotests/070 +++ b/tests/qemu-iotests/070 @@ -78,5 +78,4 @@ _img_info =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/071 b/tests/qemu-iotests/071 index fd74238312..7b1fdf7989 100755 --- a/tests/qemu-iotests/071 +++ b/tests/qemu-iotests/071 @@ -252,5 +252,4 @@ EOF =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/072 b/tests/qemu-iotests/072 index 568f8774d8..5d4e8becac 100755 --- a/tests/qemu-iotests/072 +++ b/tests/qemu-iotests/072 @@ -62,5 +62,4 @@ $QEMU_IO -c 'read -P 42 0 512' "$TEST_IMG" | _filter_qemu= _io =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/073 b/tests/qemu-iotests/073 index 37e68263b4..f5be7347d1 100755 --- a/tests/qemu-iotests/073 +++ b/tests/qemu-iotests/073 @@ -160,5 +160,4 @@ _check_test_img =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/075 b/tests/qemu-iotests/075 index 3e7ab6de95..b924d7a5f7 100755 --- a/tests/qemu-iotests/075 +++ b/tests/qemu-iotests/075 @@ -99,5 +99,4 @@ $QEMU_IO -c "read 0 512" $TEST_IMG 2>&1 | _filter_qemu_io= | _filter_testdir =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/076 b/tests/qemu-iotests/076 index df4a1614fb..64b935ad02 100755 --- a/tests/qemu-iotests/076 +++ b/tests/qemu-iotests/076 @@ -79,5 +79,4 @@ _use_sample_img parallels-v2.bz2 =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/077 b/tests/qemu-iotests/077 index 8d4be8c1e8..897afb688d 100755 --- a/tests/qemu-iotests/077 +++ b/tests/qemu-iotests/077 @@ -262,5 +262,4 @@ _check_test_img =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/078 b/tests/qemu-iotests/078 index b5f7c3a44a..36490ec94c 100755 --- a/tests/qemu-iotests/078 +++ b/tests/qemu-iotests/078 @@ -84,5 +84,4 @@ poke_file "$TEST_IMG" "$extent_size_offset" "\x00\x00\x00= \x00" =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/079 b/tests/qemu-iotests/079 index 3363e43146..d8a2a17e71 100755 --- a/tests/qemu-iotests/079 +++ b/tests/qemu-iotests/079 @@ -50,5 +50,4 @@ done =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/080 b/tests/qemu-iotests/080 index e7e7caf00d..aa7b13776a 100755 --- a/tests/qemu-iotests/080 +++ b/tests/qemu-iotests/080 @@ -177,5 +177,4 @@ poke_file "$TEST_IMG" "$offset_snap1_l1_size" "\x10\x00= \x00\x00" =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/081 b/tests/qemu-iotests/081 index 33b18106c1..d840841b0d 100755 --- a/tests/qemu-iotests/081 +++ b/tests/qemu-iotests/081 @@ -168,5 +168,4 @@ $QEMU_IO -c "open -o $quorum" -c "read -P 0x32 0 $size"= | _filter_qemu_io =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/082 b/tests/qemu-iotests/082 index fd904d69f8..4f1c03b882 100755 --- a/tests/qemu-iotests/082 +++ b/tests/qemu-iotests/082 @@ -201,5 +201,4 @@ run_qemu_img convert -o help =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/083 b/tests/qemu-iotests/083 index 51fd8825b4..39162b36ef 100755 --- a/tests/qemu-iotests/083 +++ b/tests/qemu-iotests/083 @@ -146,5 +146,4 @@ done =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/084 b/tests/qemu-iotests/084 index 333488a949..3daf41615b 100755 --- a/tests/qemu-iotests/084 +++ b/tests/qemu-iotests/084 @@ -109,5 +109,4 @@ _img_info # success, all done echo echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/085 b/tests/qemu-iotests/085 index da481225d6..375a51e07a 100755 --- a/tests/qemu-iotests/085 +++ b/tests/qemu-iotests/085 @@ -241,5 +241,4 @@ _send_qemu_cmd $h "{ 'execute': 'blockdev-snapshot', =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/086 b/tests/qemu-iotests/086 index 8611514049..1224e068b7 100755 --- a/tests/qemu-iotests/086 +++ b/tests/qemu-iotests/086 @@ -58,5 +58,4 @@ $QEMU_IMG convert -p -O $IMGFMT -f $IMGFMT "$TEST_IMG" "$= TEST_IMG".base 2>&1 |\ =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/087 b/tests/qemu-iotests/087 index dd6e5976ca..fb572dc5b8 100755 --- a/tests/qemu-iotests/087 +++ b/tests/qemu-iotests/087 @@ -199,5 +199,4 @@ EOF =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/088 b/tests/qemu-iotests/088 index f6e1848ce9..75e6ba9908 100755 --- a/tests/qemu-iotests/088 +++ b/tests/qemu-iotests/088 @@ -57,5 +57,4 @@ poke_file "$TEST_IMG" "$offset_block_size" "\x12\x34\x56\= x78" =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/089 b/tests/qemu-iotests/089 index f925f5f245..dad9fcb69f 100755 --- a/tests/qemu-iotests/089 +++ b/tests/qemu-iotests/089 @@ -126,5 +126,4 @@ $QEMU_IO -c "open -o driver=3Dqcow2 json:{\"driver\":\"= raw\",\"file.filename\":\"$ =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/090 b/tests/qemu-iotests/090 index 2ae70f7d79..74e14e9f00 100755 --- a/tests/qemu-iotests/090 +++ b/tests/qemu-iotests/090 @@ -54,5 +54,4 @@ _check_test_img =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/091 b/tests/qemu-iotests/091 index 48cf18d312..bb32f681bb 100755 --- a/tests/qemu-iotests/091 +++ b/tests/qemu-iotests/091 @@ -103,5 +103,4 @@ echo "Running 'qemu-img check -r all \$TEST_IMG'" "${QEMU_IMG}" check -r all "${TEST_IMG}" 2>&1 | _filter_testdir | _filter_= qemu =20 echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/092 b/tests/qemu-iotests/092 index eeb039c7bd..041d888984 100755 --- a/tests/qemu-iotests/092 +++ b/tests/qemu-iotests/092 @@ -91,5 +91,4 @@ poke_file "$TEST_IMG" "$offset_backing_file_size" "\x7f\x= ff\xff\xff" =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/094 b/tests/qemu-iotests/094 index aa5faff5de..47ff00651f 100755 --- a/tests/qemu-iotests/094 +++ b/tests/qemu-iotests/094 @@ -80,5 +80,4 @@ wait=3D1 _cleanup_qemu =20 # success, all done echo '*** done' -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/095 b/tests/qemu-iotests/095 index fa17640c2c..bc80c019ed 100755 --- a/tests/qemu-iotests/095 +++ b/tests/qemu-iotests/095 @@ -81,5 +81,4 @@ TEST_IMG=3D"${TEST_IMG}.base" _img_info | _filter_img_info =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/097 b/tests/qemu-iotests/097 index 2914da2da3..2a68a08358 100755 --- a/tests/qemu-iotests/097 +++ b/tests/qemu-iotests/097 @@ -121,5 +121,4 @@ done =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/098 b/tests/qemu-iotests/098 index 97f890dcf7..afe5b72c87 100755 --- a/tests/qemu-iotests/098 +++ b/tests/qemu-iotests/098 @@ -75,5 +75,4 @@ rm -f "$TEST_DIR/blkdebug.conf" =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/099 b/tests/qemu-iotests/099 index 8e8306d1e3..ac94ca7f21 100755 --- a/tests/qemu-iotests/099 +++ b/tests/qemu-iotests/099 @@ -123,5 +123,4 @@ rm -f "$TEST_IMG.compare" "$TEST_DIR/blkdebug.conf" =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/101 b/tests/qemu-iotests/101 index 38dace6aec..cc57078727 100755 --- a/tests/qemu-iotests/101 +++ b/tests/qemu-iotests/101 @@ -51,5 +51,4 @@ $QEMU_IO -c "read -P 0 0 512" "$TEST_IMG" | _filter_qemu_= io =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/102 b/tests/qemu-iotests/102 index 0fac4555b2..9acc2772c7 100755 --- a/tests/qemu-iotests/102 +++ b/tests/qemu-iotests/102 @@ -75,5 +75,4 @@ _send_qemu_cmd $QEMU_HANDLE 'quit' '' =20 # success, all done echo '*** done' -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/103 b/tests/qemu-iotests/103 index 55df533835..eaab111b5a 100755 --- a/tests/qemu-iotests/103 +++ b/tests/qemu-iotests/103 @@ -102,5 +102,4 @@ $QEMU_IO -c "open -o cache-size=3D0 $TEST_IMG" -c 'writ= e 0 64k' | _filter_qemu_io =20 # success, all done echo '*** done' -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/104 b/tests/qemu-iotests/104 index 903471346f..5818b449da 100755 --- a/tests/qemu-iotests/104 +++ b/tests/qemu-iotests/104 @@ -47,5 +47,4 @@ done =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/105 b/tests/qemu-iotests/105 index 68c6b732c2..e975f2930e 100755 --- a/tests/qemu-iotests/105 +++ b/tests/qemu-iotests/105 @@ -63,5 +63,4 @@ $QEMU_IO -c "write 14T 4096" "$TEST_IMG" | _filter_qemu_io =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/106 b/tests/qemu-iotests/106 index 9771198d70..ee81af19da 100755 --- a/tests/qemu-iotests/106 +++ b/tests/qemu-iotests/106 @@ -86,5 +86,4 @@ done =20 # success, all done echo '*** done' -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/107 b/tests/qemu-iotests/107 index 7ddb27fbc9..87e2a22cec 100755 --- a/tests/qemu-iotests/107 +++ b/tests/qemu-iotests/107 @@ -53,6 +53,5 @@ $QEMU_IO -c "open -o driver=3Draw $TEST_IMG" -c 'read -p = -P 0 196616 65528' \ =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 =20 diff --git a/tests/qemu-iotests/108 b/tests/qemu-iotests/108 index 1284fc98d1..31ea282f20 100755 --- a/tests/qemu-iotests/108 +++ b/tests/qemu-iotests/108 @@ -136,5 +136,4 @@ _check_test_img -r all =20 # success, all done echo '*** done' -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/109 b/tests/qemu-iotests/109 index 87985f66fb..e011ad86c3 100755 --- a/tests/qemu-iotests/109 +++ b/tests/qemu-iotests/109 @@ -130,5 +130,4 @@ done =20 # success, all done echo '*** done' -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/110 b/tests/qemu-iotests/110 index 0f62778f15..e596efddb5 100755 --- a/tests/qemu-iotests/110 +++ b/tests/qemu-iotests/110 @@ -87,5 +87,4 @@ _make_test_img -b "$TEST_IMG_REL.base" =20 # success, all done echo '*** done' -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/111 b/tests/qemu-iotests/111 index 85b6dd1746..37223d93d7 100755 --- a/tests/qemu-iotests/111 +++ b/tests/qemu-iotests/111 @@ -46,5 +46,4 @@ $QEMU_IMG create -f $IMGFMT -b "$TEST_IMG.inexistent" "$T= EST_IMG" 2>&1 \ =20 # success, all done echo '*** done' -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/112 b/tests/qemu-iotests/112 index 5c4ecfeb4c..221892fbd1 100755 --- a/tests/qemu-iotests/112 +++ b/tests/qemu-iotests/112 @@ -289,5 +289,4 @@ _check_test_img =20 # success, all done echo '*** done' -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/113 b/tests/qemu-iotests/113 index 91af75d687..9d48020b94 100755 --- a/tests/qemu-iotests/113 +++ b/tests/qemu-iotests/113 @@ -69,5 +69,4 @@ $QEMU_IMG amend -f $IMGFMT -o foo=3Dbar "$TEST_IMG" 2>&1 = | _filter_imgfmt # success, all done echo echo '*** done' -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/114 b/tests/qemu-iotests/114 index 66313cae91..44ef79a87f 100755 --- a/tests/qemu-iotests/114 +++ b/tests/qemu-iotests/114 @@ -55,5 +55,4 @@ $QEMU_IO -c "open -o backing.driver=3D$IMGFMT $TEST_IMG" = -c "read 0 4k" | _filter_ =20 # success, all done echo '*** done' -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/115 b/tests/qemu-iotests/115 index 2f06622e36..f2ec8fbd44 100755 --- a/tests/qemu-iotests/115 +++ b/tests/qemu-iotests/115 @@ -88,5 +88,4 @@ $QEMU_IMG check "$TEST_IMG" | \ =20 # success, all done echo '*** done' -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/116 b/tests/qemu-iotests/116 index 7378c34bd6..715a44200f 100755 --- a/tests/qemu-iotests/116 +++ b/tests/qemu-iotests/116 @@ -89,5 +89,4 @@ $QEMU_IO -f "$IMGFMT" -c "read 0 $size" "$TEST_IMG" 2>&1 = | _filter_qemu_io | _fi =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/117 b/tests/qemu-iotests/117 index 2ace2c9f89..07aca0eba1 100755 --- a/tests/qemu-iotests/117 +++ b/tests/qemu-iotests/117 @@ -80,5 +80,4 @@ $QEMU_IO -c 'read -P 42 0 64k' "$TEST_IMG" | _filter_qemu= _io =20 # success, all done echo '*** done' -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/119 b/tests/qemu-iotests/119 index 3df227748a..dbc7350458 100755 --- a/tests/qemu-iotests/119 +++ b/tests/qemu-iotests/119 @@ -53,5 +53,4 @@ echo "{'execute': 'qmp_capabilities'} # success, all done echo echo '*** done' -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/120 b/tests/qemu-iotests/120 index 0ce0a2c9cd..3816260951 100755 --- a/tests/qemu-iotests/120 +++ b/tests/qemu-iotests/120 @@ -59,5 +59,4 @@ $QEMU_IO_PROG -c 'read -P 42 0 64k' \ # success, all done echo echo '*** done' -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/121 b/tests/qemu-iotests/121 index c6ce9e782a..04b38c9de8 100755 --- a/tests/qemu-iotests/121 +++ b/tests/qemu-iotests/121 @@ -95,5 +95,4 @@ _check_test_img # success, all done echo echo '*** done' -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/122 b/tests/qemu-iotests/122 index e513b6abbf..ea4ba0f098 100755 --- a/tests/qemu-iotests/122 +++ b/tests/qemu-iotests/122 @@ -216,5 +216,4 @@ done =20 # success, all done echo '*** done' -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/123 b/tests/qemu-iotests/123 index 9edcc4c8d2..6701c7ab54 100755 --- a/tests/qemu-iotests/123 +++ b/tests/qemu-iotests/123 @@ -55,5 +55,4 @@ $QEMU_IO -c 'read -P 42 0 1M' "$TEST_IMG" | _filter_qemu_= io # success, all done echo echo '*** done' -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/125 b/tests/qemu-iotests/125 index 1a11496024..6a0504ba0a 100755 --- a/tests/qemu-iotests/125 +++ b/tests/qemu-iotests/125 @@ -127,5 +127,4 @@ done =20 # success, all done echo '*** done' -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/126 b/tests/qemu-iotests/126 index 73ed16a9af..882ace0191 100755 --- a/tests/qemu-iotests/126 +++ b/tests/qemu-iotests/126 @@ -99,5 +99,4 @@ popd >/dev/null =20 # success, all done echo '*** done' -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/127 b/tests/qemu-iotests/127 index ee7e3d365d..e84f0d80f6 100755 --- a/tests/qemu-iotests/127 +++ b/tests/qemu-iotests/127 @@ -91,5 +91,4 @@ wait=3Dyes _cleanup_qemu =20 # success, all done echo '*** done' -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/128 b/tests/qemu-iotests/128 index 412d4f86ca..51009f18f6 100755 --- a/tests/qemu-iotests/128 +++ b/tests/qemu-iotests/128 @@ -84,5 +84,4 @@ _sudo_qemu_io_wrapper --format "$IMGFMT" --nocache \ =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/130 b/tests/qemu-iotests/130 index e5986d59bb..ed234c3b6d 100755 --- a/tests/qemu-iotests/130 +++ b/tests/qemu-iotests/130 @@ -90,5 +90,4 @@ _img_info | _filter_img_info =20 # success, all done echo '*** done' -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/131 b/tests/qemu-iotests/131 index 930a80e02f..9c12d6c7f9 100755 --- a/tests/qemu-iotests/131 +++ b/tests/qemu-iotests/131 @@ -70,5 +70,4 @@ _check_test_img -r all =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/133 b/tests/qemu-iotests/133 index 61af222c9e..61adc4374b 100755 --- a/tests/qemu-iotests/133 +++ b/tests/qemu-iotests/133 @@ -83,5 +83,4 @@ $QEMU_IO -c 'reopen -o backing.driver=3Dqcow2' $TEST_IMG =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/134 b/tests/qemu-iotests/134 index 59f2662614..c1c45c66d6 100755 --- a/tests/qemu-iotests/134 +++ b/tests/qemu-iotests/134 @@ -72,5 +72,4 @@ $QEMU_IO --object $SECRETALT -c "read -P 0xa 0 $size" --i= mage-opts $IMGSPEC | _f =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/135 b/tests/qemu-iotests/135 index a6d35c147a..5c41718490 100755 --- a/tests/qemu-iotests/135 +++ b/tests/qemu-iotests/135 @@ -47,5 +47,4 @@ $QEMU_IMG info "$TEST_IMG" 2>&1| _filter_testdir =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/137 b/tests/qemu-iotests/137 index 1c3981c982..1e6c6afcca 100755 --- a/tests/qemu-iotests/137 +++ b/tests/qemu-iotests/137 @@ -138,5 +138,4 @@ $QEMU_IO \ =20 # success, all done echo '*** done' -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/138 b/tests/qemu-iotests/138 index 4b21217038..cb98fc34b9 100755 --- a/tests/qemu-iotests/138 +++ b/tests/qemu-iotests/138 @@ -66,5 +66,4 @@ _check_test_img =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/140 b/tests/qemu-iotests/140 index bdc1e08027..63390fd896 100755 --- a/tests/qemu-iotests/140 +++ b/tests/qemu-iotests/140 @@ -97,5 +97,4 @@ wait=3D1 _cleanup_qemu =20 # success, all done echo '*** done' -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/141 b/tests/qemu-iotests/141 index c5e3981530..996bf16963 100755 --- a/tests/qemu-iotests/141 +++ b/tests/qemu-iotests/141 @@ -183,5 +183,4 @@ _cleanup_qemu =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/142 b/tests/qemu-iotests/142 index 6a8d6d8daa..6cb73bc6fa 100755 --- a/tests/qemu-iotests/142 +++ b/tests/qemu-iotests/142 @@ -352,5 +352,4 @@ echo "$hmp_cmds" | run_qemu -drive "$files","$ids" | gr= ep "Cache" =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/143 b/tests/qemu-iotests/143 index 100d225e24..1ae5296607 100755 --- a/tests/qemu-iotests/143 +++ b/tests/qemu-iotests/143 @@ -67,5 +67,4 @@ wait=3D1 _cleanup_qemu =20 # success, all done echo '*** done' -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/144 b/tests/qemu-iotests/144 index 65fcfb77a6..d6015ce0eb 100755 --- a/tests/qemu-iotests/144 +++ b/tests/qemu-iotests/144 @@ -108,5 +108,4 @@ _send_qemu_cmd $h "{ 'execute': 'blockdev-snapshot-sync= ', =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/145 b/tests/qemu-iotests/145 index 3fa205a07d..c81bbb8a20 100755 --- a/tests/qemu-iotests/145 +++ b/tests/qemu-iotests/145 @@ -61,5 +61,4 @@ echo quit | $QEMU -nographic $SYSEMU_EXTRA_ARGS -drive $S= YSEMU_DRIVE_ARG \ =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/146 b/tests/qemu-iotests/146 index 6b418c60f7..238658d642 100755 --- a/tests/qemu-iotests/146 +++ b/tests/qemu-iotests/146 @@ -159,5 +159,4 @@ echo ${QEMU_IO} -c "open -o driver=3Dvpc,force_size_calc=3Dcurrent_size ${TEST_= IMG}" -c 'map' =20 echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/150 b/tests/qemu-iotests/150 index 51e4e124cd..6c5d54228b 100755 --- a/tests/qemu-iotests/150 +++ b/tests/qemu-iotests/150 @@ -67,5 +67,4 @@ $QEMU_IMG map "$TEST_IMG" | _filter_qemu_img_map =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/153 b/tests/qemu-iotests/153 index ae9158fa91..54f3ad8c79 100755 --- a/tests/qemu-iotests/153 +++ b/tests/qemu-iotests/153 @@ -228,5 +228,4 @@ _cleanup_qemu =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/154 b/tests/qemu-iotests/154 index 7bf0c2e91e..7b56d60339 100755 --- a/tests/qemu-iotests/154 +++ b/tests/qemu-iotests/154 @@ -451,5 +451,4 @@ $QEMU_IMG map --output=3Djson "$TEST_IMG" | _filter_qem= u_img_map =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/156 b/tests/qemu-iotests/156 index 62100fff7a..618060180c 100755 --- a/tests/qemu-iotests/156 +++ b/tests/qemu-iotests/156 @@ -170,5 +170,4 @@ echo =20 # success, all done echo '*** done' -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/157 b/tests/qemu-iotests/157 index 2b2b886e99..c44edd65e7 100755 --- a/tests/qemu-iotests/157 +++ b/tests/qemu-iotests/157 @@ -94,5 +94,4 @@ done =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/158 b/tests/qemu-iotests/158 index fe3318bbe2..abf79f3cc2 100755 --- a/tests/qemu-iotests/158 +++ b/tests/qemu-iotests/158 @@ -80,5 +80,4 @@ $QEMU_IO --object $SECRET -c "read -P 0xa 1024 64512" --i= mage-opts $IMGSPEC | _f =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/162 b/tests/qemu-iotests/162 index 6cadc0c75b..c601c13525 100755 --- a/tests/qemu-iotests/162 +++ b/tests/qemu-iotests/162 @@ -110,5 +110,4 @@ rm -f 42 # success, all done echo echo '*** done' -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/171 b/tests/qemu-iotests/171 index 3ea97f46b6..93b119939d 100755 --- a/tests/qemu-iotests/171 +++ b/tests/qemu-iotests/171 @@ -206,5 +206,4 @@ _cleanup_test_img # success, all done echo echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/172 b/tests/qemu-iotests/172 index 2fd80c7844..56376f0f37 100755 --- a/tests/qemu-iotests/172 +++ b/tests/qemu-iotests/172 @@ -245,5 +245,4 @@ check_cache_mode -device floppy,drive=3Dnone0,write-cac= he=3Doff =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/173 b/tests/qemu-iotests/173 index 0df1865199..f5185a1945 100755 --- a/tests/qemu-iotests/173 +++ b/tests/qemu-iotests/173 @@ -92,5 +92,4 @@ _cleanup_qemu =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/174 b/tests/qemu-iotests/174 index 2c530a1e64..b1527583c7 100755 --- a/tests/qemu-iotests/174 +++ b/tests/qemu-iotests/174 @@ -35,9 +35,15 @@ _cleanup() } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 +_fail() +{ + echo "$*" + status=3D1 + exit 1 +} + _unsupported_fmt raw =20 - size=3D256K IMGFMT=3Draw IMGKEYSECRET=3D IMGOPTS=3D _make_test_img $size | _filter_img= fmt =20 @@ -53,5 +59,4 @@ test $? -eq 1 || _fail "did not fail" =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/175 b/tests/qemu-iotests/175 index a000405737..b9703dd99c 100755 --- a/tests/qemu-iotests/175 +++ b/tests/qemu-iotests/175 @@ -55,5 +55,4 @@ done =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/176 b/tests/qemu-iotests/176 index 9928833137..9f4a5db86a 100755 --- a/tests/qemu-iotests/176 +++ b/tests/qemu-iotests/176 @@ -125,5 +125,4 @@ done =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/178 b/tests/qemu-iotests/178 index ffa3d3148b..4eba90243d 100755 --- a/tests/qemu-iotests/178 +++ b/tests/qemu-iotests/178 @@ -164,5 +164,4 @@ done =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/181 b/tests/qemu-iotests/181 index b308c8194f..cd90eb98c5 100755 --- a/tests/qemu-iotests/181 +++ b/tests/qemu-iotests/181 @@ -128,5 +128,4 @@ _check_test_img =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/182 b/tests/qemu-iotests/182 index c7cd4ff678..f7705b36f7 100755 --- a/tests/qemu-iotests/182 +++ b/tests/qemu-iotests/182 @@ -71,5 +71,4 @@ _cleanup_qemu =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/183 b/tests/qemu-iotests/183 index 764632c16b..ced0df4a76 100755 --- a/tests/qemu-iotests/183 +++ b/tests/qemu-iotests/183 @@ -134,5 +134,4 @@ $QEMU_IMG compare "$TEST_IMG.dest" "$TEST_IMG" =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/184 b/tests/qemu-iotests/184 index 1b2859de5a..c5d0226a67 100755 --- a/tests/qemu-iotests/184 +++ b/tests/qemu-iotests/184 @@ -200,5 +200,4 @@ EOF echo # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/185 b/tests/qemu-iotests/185 index 563ae366fd..09ebe6b659 100755 --- a/tests/qemu-iotests/185 +++ b/tests/qemu-iotests/185 @@ -204,5 +204,4 @@ _check_test_img =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/186 b/tests/qemu-iotests/186 index 3d52508452..a87a7f81ff 100755 --- a/tests/qemu-iotests/186 +++ b/tests/qemu-iotests/186 @@ -141,5 +141,4 @@ check_info_block -drive if=3Dpflash,driver=3Dnull-co,si= ze=3D1M =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/187 b/tests/qemu-iotests/187 index 4351702784..4d304f91ca 100755 --- a/tests/qemu-iotests/187 +++ b/tests/qemu-iotests/187 @@ -63,5 +63,4 @@ $QEMU_IO -c 'reopen -r' -c 'reopen -w' -c 'write 0 64k' $= TEST_IMG | _filter_qemu =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/188 b/tests/qemu-iotests/188 index 042bf96178..6e945ccf38 100755 --- a/tests/qemu-iotests/188 +++ b/tests/qemu-iotests/188 @@ -70,5 +70,4 @@ $QEMU_IO --object $SECRETALT -c "read -P 0xa 0 $size" --i= mage-opts $IMGSPEC | _f =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/189 b/tests/qemu-iotests/189 index 9108495d99..5213057b14 100755 --- a/tests/qemu-iotests/189 +++ b/tests/qemu-iotests/189 @@ -80,5 +80,4 @@ $QEMU_IO --object $SECRET0 --object $SECRET1 -c "read -P = 0xa 1024 64512" --image =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/190 b/tests/qemu-iotests/190 index aceba63b49..577bbb70f7 100755 --- a/tests/qemu-iotests/190 +++ b/tests/qemu-iotests/190 @@ -53,5 +53,4 @@ $QEMU_IMG measure -O qcow2 -o cluster_size=3D2M -f qcow2 = "$TEST_IMG" =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/191 b/tests/qemu-iotests/191 index 25d94211d9..0f740f7b38 100755 --- a/tests/qemu-iotests/191 +++ b/tests/qemu-iotests/191 @@ -148,5 +148,4 @@ TEST_IMG=3D"$TEST_IMG.ovl2" _img_info =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/192 b/tests/qemu-iotests/192 index 37fbb71cd0..5d0af35816 100755 --- a/tests/qemu-iotests/192 +++ b/tests/qemu-iotests/192 @@ -66,5 +66,4 @@ _send_qemu_cmd $h "q" "(qemu)" =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/195 b/tests/qemu-iotests/195 index 248cf90f53..ff6b1fde9d 100755 --- a/tests/qemu-iotests/195 +++ b/tests/qemu-iotests/195 @@ -87,5 +87,4 @@ _img_info =20 # success, all done echo "*** done" -rm -f $seq.full status=3D0 --=20 2.13.6 From nobody Sat May 4 14:04:10 2024 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; 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 (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1510854053091342.16770903121517; Thu, 16 Nov 2017 09:40:53 -0800 (PST) Received: from localhost ([::1]:42139 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eFO9d-0000Vs-8d for importer@patchew.org; Thu, 16 Nov 2017 12:40:45 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59815) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eFO7b-0007a3-DD for qemu-devel@nongnu.org; Thu, 16 Nov 2017 12:38:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eFO7Z-0003GC-GV for qemu-devel@nongnu.org; Thu, 16 Nov 2017 12:38:39 -0500 Received: from mx1.redhat.com ([209.132.183.28]:37590) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eFO7T-0002zW-D5; Thu, 16 Nov 2017 12:38:31 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 78C1781127; Thu, 16 Nov 2017 17:38:30 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-120-124.rdu2.redhat.com [10.10.120.124]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B667A60602; Thu, 16 Nov 2017 17:38:29 +0000 (UTC) From: Cleber Rosa To: qemu-devel@nongnu.org Date: Thu, 16 Nov 2017 12:38:08 -0500 Message-Id: <20171116173810.16457-9-crosa@redhat.com> In-Reply-To: <20171116173810.16457-1-crosa@redhat.com> References: <20171116173810.16457-1-crosa@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Thu, 16 Nov 2017 17:38:30 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 08/10] qemu-iotests: clean up double comment characters 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: Kevin Wolf , Cleber Rosa , qemu-block@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This is a syntactic only change, just to make it consistent with the style used on all other tests. Signed-off-by: Cleber Rosa --- tests/qemu-iotests/048 | 37 ++++++++++++++++++------------------- tests/qemu-iotests/074 | 40 ++++++++++++++++++++-------------------- 2 files changed, 38 insertions(+), 39 deletions(-) diff --git a/tests/qemu-iotests/048 b/tests/qemu-iotests/048 index 531bed217c..3253d77c91 100755 --- a/tests/qemu-iotests/048 +++ b/tests/qemu-iotests/048 @@ -1,23 +1,22 @@ #!/bin/bash -## -## qemu-img compare test -## -## -## Copyright (C) 2013 Red Hat, Inc. -## -## This program is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published by -## the Free Software Foundation; either version 2 of the License, or -## (at your option) any later version. -## -## This program is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with this program. If not, see . -## +# +# qemu-img compare test +# +# +# Copyright (C) 2013 Red Hat, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . # # Creator/Owner: mrezanin@redhat.com # diff --git a/tests/qemu-iotests/074 b/tests/qemu-iotests/074 index d454580067..d09c909bd8 100755 --- a/tests/qemu-iotests/074 +++ b/tests/qemu-iotests/074 @@ -1,24 +1,24 @@ #!/bin/bash -## -## qemu-img compare test (qcow2 only ones) -## -## -## Copyright (C) 2013 Red Hat, Inc. -## -## This program is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published by -## the Free Software Foundation; either version 2 of the License, or -## (at your option) any later version. -## -## This program is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with this program. If not, see . -## -## Creator/Owner: famz@redhat.com +# +# qemu-img compare test (qcow2 only ones) +# +# +# Copyright (C) 2013 Red Hat, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# +# Creator/Owner: famz@redhat.com # =20 seq=3D`basename $0` --=20 2.13.6 From nobody Sat May 4 14:04:10 2024 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; 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 1510854390877130.84124416036332; Thu, 16 Nov 2017 09:46:30 -0800 (PST) Received: from localhost ([::1]:42187 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eFOF6-0005PB-FC for importer@patchew.org; Thu, 16 Nov 2017 12:46:24 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59991) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eFO7t-0007op-W6 for qemu-devel@nongnu.org; Thu, 16 Nov 2017 12:39:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eFO7o-0003v0-22 for qemu-devel@nongnu.org; Thu, 16 Nov 2017 12:38:58 -0500 Received: from mx1.redhat.com ([209.132.183.28]:53246) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eFO7W-000377-OS; Thu, 16 Nov 2017 12:38:35 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E01C1883D7; Thu, 16 Nov 2017 17:38:33 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-120-124.rdu2.redhat.com [10.10.120.124]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9B66360DD7; Thu, 16 Nov 2017 17:38:30 +0000 (UTC) From: Cleber Rosa To: qemu-devel@nongnu.org Date: Thu, 16 Nov 2017 12:38:09 -0500 Message-Id: <20171116173810.16457-10-crosa@redhat.com> In-Reply-To: <20171116173810.16457-1-crosa@redhat.com> References: <20171116173810.16457-1-crosa@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Thu, 16 Nov 2017 17:38:33 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 09/10] qemu-iotests: remove unused "here" variable 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: Kevin Wolf , Cleber Rosa , qemu-block@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Another legacy variable that did not convince me it has any purpose whatsoever. Signed-off-by: Cleber Rosa --- tests/qemu-iotests/001 | 1 - tests/qemu-iotests/002 | 1 - tests/qemu-iotests/003 | 1 - tests/qemu-iotests/004 | 1 - tests/qemu-iotests/005 | 1 - tests/qemu-iotests/007 | 1 - tests/qemu-iotests/008 | 1 - tests/qemu-iotests/009 | 1 - tests/qemu-iotests/010 | 1 - tests/qemu-iotests/011 | 1 - tests/qemu-iotests/012 | 1 - tests/qemu-iotests/013 | 1 - tests/qemu-iotests/014 | 1 - tests/qemu-iotests/015 | 1 - tests/qemu-iotests/017 | 1 - tests/qemu-iotests/018 | 1 - tests/qemu-iotests/019 | 1 - tests/qemu-iotests/020 | 1 - tests/qemu-iotests/021 | 1 - tests/qemu-iotests/022 | 1 - tests/qemu-iotests/023 | 1 - tests/qemu-iotests/024 | 1 - tests/qemu-iotests/025 | 1 - tests/qemu-iotests/026 | 1 - tests/qemu-iotests/027 | 1 - tests/qemu-iotests/028 | 1 - tests/qemu-iotests/029 | 1 - tests/qemu-iotests/031 | 1 - tests/qemu-iotests/032 | 1 - tests/qemu-iotests/033 | 1 - tests/qemu-iotests/034 | 1 - tests/qemu-iotests/035 | 1 - tests/qemu-iotests/036 | 1 - tests/qemu-iotests/037 | 1 - tests/qemu-iotests/038 | 1 - tests/qemu-iotests/039 | 1 - tests/qemu-iotests/042 | 1 - tests/qemu-iotests/043 | 1 - tests/qemu-iotests/046 | 1 - tests/qemu-iotests/047 | 1 - tests/qemu-iotests/049 | 1 - tests/qemu-iotests/050 | 1 - tests/qemu-iotests/051 | 1 - tests/qemu-iotests/052 | 1 - tests/qemu-iotests/053 | 1 - tests/qemu-iotests/054 | 1 - tests/qemu-iotests/058 | 1 - tests/qemu-iotests/059 | 1 - tests/qemu-iotests/060 | 1 - tests/qemu-iotests/061 | 1 - tests/qemu-iotests/062 | 1 - tests/qemu-iotests/063 | 1 - tests/qemu-iotests/064 | 1 - tests/qemu-iotests/066 | 1 - tests/qemu-iotests/067 | 1 - tests/qemu-iotests/068 | 1 - tests/qemu-iotests/069 | 1 - tests/qemu-iotests/070 | 1 - tests/qemu-iotests/071 | 1 - tests/qemu-iotests/072 | 1 - tests/qemu-iotests/073 | 1 - tests/qemu-iotests/075 | 1 - tests/qemu-iotests/076 | 1 - tests/qemu-iotests/077 | 1 - tests/qemu-iotests/078 | 1 - tests/qemu-iotests/079 | 1 - tests/qemu-iotests/080 | 1 - tests/qemu-iotests/081 | 1 - tests/qemu-iotests/082 | 1 - tests/qemu-iotests/083 | 1 - tests/qemu-iotests/084 | 1 - tests/qemu-iotests/085 | 1 - tests/qemu-iotests/086 | 1 - tests/qemu-iotests/087 | 1 - tests/qemu-iotests/088 | 1 - tests/qemu-iotests/089 | 1 - tests/qemu-iotests/090 | 1 - tests/qemu-iotests/091 | 1 - tests/qemu-iotests/092 | 1 - tests/qemu-iotests/094 | 1 - tests/qemu-iotests/095 | 1 - tests/qemu-iotests/097 | 1 - tests/qemu-iotests/098 | 1 - tests/qemu-iotests/099 | 1 - tests/qemu-iotests/101 | 1 - tests/qemu-iotests/102 | 1 - tests/qemu-iotests/103 | 1 - tests/qemu-iotests/104 | 1 - tests/qemu-iotests/105 | 1 - tests/qemu-iotests/106 | 1 - tests/qemu-iotests/107 | 1 - tests/qemu-iotests/108 | 1 - tests/qemu-iotests/109 | 1 - tests/qemu-iotests/110 | 1 - tests/qemu-iotests/111 | 1 - tests/qemu-iotests/112 | 1 - tests/qemu-iotests/113 | 1 - tests/qemu-iotests/114 | 1 - tests/qemu-iotests/115 | 1 - tests/qemu-iotests/116 | 1 - tests/qemu-iotests/117 | 1 - tests/qemu-iotests/119 | 1 - tests/qemu-iotests/120 | 1 - tests/qemu-iotests/121 | 1 - tests/qemu-iotests/122 | 1 - tests/qemu-iotests/123 | 1 - tests/qemu-iotests/125 | 1 - tests/qemu-iotests/126 | 1 - tests/qemu-iotests/127 | 1 - tests/qemu-iotests/128 | 1 - tests/qemu-iotests/130 | 1 - tests/qemu-iotests/131 | 1 - tests/qemu-iotests/133 | 1 - tests/qemu-iotests/134 | 1 - tests/qemu-iotests/135 | 1 - tests/qemu-iotests/137 | 1 - tests/qemu-iotests/138 | 1 - tests/qemu-iotests/140 | 1 - tests/qemu-iotests/141 | 1 - tests/qemu-iotests/142 | 1 - tests/qemu-iotests/143 | 1 - tests/qemu-iotests/144 | 1 - tests/qemu-iotests/145 | 1 - tests/qemu-iotests/146 | 1 - tests/qemu-iotests/150 | 1 - tests/qemu-iotests/153 | 1 - tests/qemu-iotests/154 | 1 - tests/qemu-iotests/156 | 1 - tests/qemu-iotests/157 | 1 - tests/qemu-iotests/158 | 1 - tests/qemu-iotests/159 | 1 - tests/qemu-iotests/160 | 1 - tests/qemu-iotests/162 | 1 - tests/qemu-iotests/170 | 1 - tests/qemu-iotests/171 | 1 - tests/qemu-iotests/172 | 1 - tests/qemu-iotests/173 | 1 - tests/qemu-iotests/174 | 1 - tests/qemu-iotests/175 | 1 - tests/qemu-iotests/176 | 1 - tests/qemu-iotests/177 | 1 - tests/qemu-iotests/178 | 1 - tests/qemu-iotests/179 | 1 - tests/qemu-iotests/181 | 1 - tests/qemu-iotests/182 | 1 - tests/qemu-iotests/183 | 1 - tests/qemu-iotests/184 | 1 - tests/qemu-iotests/185 | 1 - tests/qemu-iotests/186 | 1 - tests/qemu-iotests/187 | 1 - tests/qemu-iotests/188 | 1 - tests/qemu-iotests/189 | 1 - tests/qemu-iotests/190 | 1 - tests/qemu-iotests/191 | 1 - tests/qemu-iotests/192 | 1 - tests/qemu-iotests/195 | 1 - tests/qemu-iotests/197 | 1 - 157 files changed, 157 deletions(-) diff --git a/tests/qemu-iotests/001 b/tests/qemu-iotests/001 index 5830f68ba0..ce671e50e7 100755 --- a/tests/qemu-iotests/001 +++ b/tests/qemu-iotests/001 @@ -23,7 +23,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/002 b/tests/qemu-iotests/002 index 7dd1774464..8f57a41953 100755 --- a/tests/qemu-iotests/002 +++ b/tests/qemu-iotests/002 @@ -23,7 +23,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/003 b/tests/qemu-iotests/003 index 13cc8041a3..102ff9cab9 100755 --- a/tests/qemu-iotests/003 +++ b/tests/qemu-iotests/003 @@ -23,7 +23,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/004 b/tests/qemu-iotests/004 index 710148c2bb..8ddae7fea4 100755 --- a/tests/qemu-iotests/004 +++ b/tests/qemu-iotests/004 @@ -23,7 +23,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/005 b/tests/qemu-iotests/005 index d2c6575992..6caf5b0241 100755 --- a/tests/qemu-iotests/005 +++ b/tests/qemu-iotests/005 @@ -26,7 +26,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/007 b/tests/qemu-iotests/007 index 3fe2fe5dad..fc4458e11d 100755 --- a/tests/qemu-iotests/007 +++ b/tests/qemu-iotests/007 @@ -23,7 +23,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/008 b/tests/qemu-iotests/008 index f021b8ea3a..7b891629db 100755 --- a/tests/qemu-iotests/008 +++ b/tests/qemu-iotests/008 @@ -23,7 +23,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/009 b/tests/qemu-iotests/009 index 8d56673bc6..6a2498f4ab 100755 --- a/tests/qemu-iotests/009 +++ b/tests/qemu-iotests/009 @@ -23,7 +23,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/010 b/tests/qemu-iotests/010 index 3f91224795..447914da1a 100755 --- a/tests/qemu-iotests/010 +++ b/tests/qemu-iotests/010 @@ -23,7 +23,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/011 b/tests/qemu-iotests/011 index 921f43c03d..d758d7a577 100755 --- a/tests/qemu-iotests/011 +++ b/tests/qemu-iotests/011 @@ -23,7 +23,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/012 b/tests/qemu-iotests/012 index 3121f947f6..a4a7303a9a 100755 --- a/tests/qemu-iotests/012 +++ b/tests/qemu-iotests/012 @@ -25,7 +25,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/013 b/tests/qemu-iotests/013 index 095c2a0cd6..1db4649541 100755 --- a/tests/qemu-iotests/013 +++ b/tests/qemu-iotests/013 @@ -23,7 +23,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/014 b/tests/qemu-iotests/014 index c28970732b..b679750ba6 100755 --- a/tests/qemu-iotests/014 +++ b/tests/qemu-iotests/014 @@ -25,7 +25,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/015 b/tests/qemu-iotests/015 index a5cda4742c..3ea0e5472d 100755 --- a/tests/qemu-iotests/015 +++ b/tests/qemu-iotests/015 @@ -23,7 +23,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/017 b/tests/qemu-iotests/017 index 2398fc2bf1..fb4974cd87 100755 --- a/tests/qemu-iotests/017 +++ b/tests/qemu-iotests/017 @@ -23,7 +23,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/018 b/tests/qemu-iotests/018 index 8d4ccda85e..06139efa64 100755 --- a/tests/qemu-iotests/018 +++ b/tests/qemu-iotests/018 @@ -23,7 +23,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/019 b/tests/qemu-iotests/019 index b06ef93976..ddf5f7f7f3 100755 --- a/tests/qemu-iotests/019 +++ b/tests/qemu-iotests/019 @@ -25,7 +25,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/020 b/tests/qemu-iotests/020 index b34cfc16e1..d26ef8df86 100755 --- a/tests/qemu-iotests/020 +++ b/tests/qemu-iotests/020 @@ -23,7 +23,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/021 b/tests/qemu-iotests/021 index 97e27d6cf3..1b6dfe0fc1 100755 --- a/tests/qemu-iotests/021 +++ b/tests/qemu-iotests/021 @@ -23,7 +23,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/022 b/tests/qemu-iotests/022 index bc9186c0fa..77a7516be2 100755 --- a/tests/qemu-iotests/022 +++ b/tests/qemu-iotests/022 @@ -25,7 +25,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/023 b/tests/qemu-iotests/023 index 99fda1ff14..eaa73ac866 100755 --- a/tests/qemu-iotests/023 +++ b/tests/qemu-iotests/023 @@ -23,7 +23,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/024 b/tests/qemu-iotests/024 index b3cabe1fb5..ce661cc5a3 100755 --- a/tests/qemu-iotests/024 +++ b/tests/qemu-iotests/024 @@ -23,7 +23,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/025 b/tests/qemu-iotests/025 index a781632b09..93814d5931 100755 --- a/tests/qemu-iotests/025 +++ b/tests/qemu-iotests/025 @@ -23,7 +23,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/026 b/tests/qemu-iotests/026 index 166c8267f7..7d8c07b240 100755 --- a/tests/qemu-iotests/026 +++ b/tests/qemu-iotests/026 @@ -23,7 +23,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/027 b/tests/qemu-iotests/027 index c9416c719f..a7349c178b 100755 --- a/tests/qemu-iotests/027 +++ b/tests/qemu-iotests/027 @@ -23,7 +23,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/028 b/tests/qemu-iotests/028 index f2991a28aa..85deaf2dad 100755 --- a/tests/qemu-iotests/028 +++ b/tests/qemu-iotests/028 @@ -26,7 +26,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/029 b/tests/qemu-iotests/029 index fee694f305..07df4b2959 100755 --- a/tests/qemu-iotests/029 +++ b/tests/qemu-iotests/029 @@ -23,7 +23,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/031 b/tests/qemu-iotests/031 index da44539b0f..21f8eae2a7 100755 --- a/tests/qemu-iotests/031 +++ b/tests/qemu-iotests/031 @@ -23,7 +23,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/032 b/tests/qemu-iotests/032 index 15a0ff6298..e4b62e6deb 100755 --- a/tests/qemu-iotests/032 +++ b/tests/qemu-iotests/032 @@ -25,7 +25,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/033 b/tests/qemu-iotests/033 index d4beecc9c0..2eca619837 100755 --- a/tests/qemu-iotests/033 +++ b/tests/qemu-iotests/033 @@ -23,7 +23,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/034 b/tests/qemu-iotests/034 index c0eb87b40a..90b49c2cde 100755 --- a/tests/qemu-iotests/034 +++ b/tests/qemu-iotests/034 @@ -23,7 +23,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/035 b/tests/qemu-iotests/035 index 04c4cf0f58..d174ae3c51 100755 --- a/tests/qemu-iotests/035 +++ b/tests/qemu-iotests/035 @@ -24,7 +24,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/036 b/tests/qemu-iotests/036 index 990b9d82b6..858caa889a 100755 --- a/tests/qemu-iotests/036 +++ b/tests/qemu-iotests/036 @@ -26,7 +26,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/037 b/tests/qemu-iotests/037 index c4d55babe2..ed57e5a2ed 100755 --- a/tests/qemu-iotests/037 +++ b/tests/qemu-iotests/037 @@ -23,7 +23,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/038 b/tests/qemu-iotests/038 index b35c30fa17..9266fbbb57 100755 --- a/tests/qemu-iotests/038 +++ b/tests/qemu-iotests/038 @@ -23,7 +23,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/039 b/tests/qemu-iotests/039 index 99a33df803..f57d931b5b 100755 --- a/tests/qemu-iotests/039 +++ b/tests/qemu-iotests/039 @@ -26,7 +26,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/042 b/tests/qemu-iotests/042 index 7fafb6a436..24b9c20749 100755 --- a/tests/qemu-iotests/042 +++ b/tests/qemu-iotests/042 @@ -23,7 +23,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/043 b/tests/qemu-iotests/043 index 0ce07adfd0..fee664cbfd 100755 --- a/tests/qemu-iotests/043 +++ b/tests/qemu-iotests/043 @@ -23,7 +23,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/046 b/tests/qemu-iotests/046 index c3c16ebd3d..9f7e4df3af 100755 --- a/tests/qemu-iotests/046 +++ b/tests/qemu-iotests/046 @@ -23,7 +23,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/047 b/tests/qemu-iotests/047 index ebbb36c349..e8ca27e3c8 100755 --- a/tests/qemu-iotests/047 +++ b/tests/qemu-iotests/047 @@ -24,7 +24,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/049 b/tests/qemu-iotests/049 index 984652cd97..8b235cec7f 100755 --- a/tests/qemu-iotests/049 +++ b/tests/qemu-iotests/049 @@ -23,7 +23,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/050 b/tests/qemu-iotests/050 index f290c68498..6131cc816a 100755 --- a/tests/qemu-iotests/050 +++ b/tests/qemu-iotests/050 @@ -23,7 +23,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/051 b/tests/qemu-iotests/051 index b6903d13c4..b5f1b34579 100755 --- a/tests/qemu-iotests/051 +++ b/tests/qemu-iotests/051 @@ -23,7 +23,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/052 b/tests/qemu-iotests/052 index 33c3e55713..2c423d7d34 100755 --- a/tests/qemu-iotests/052 +++ b/tests/qemu-iotests/052 @@ -23,7 +23,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/053 b/tests/qemu-iotests/053 index a84dde31e0..32c75472ae 100755 --- a/tests/qemu-iotests/053 +++ b/tests/qemu-iotests/053 @@ -23,7 +23,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/054 b/tests/qemu-iotests/054 index 0fc2a8faa6..d3b7f6a727 100755 --- a/tests/qemu-iotests/054 +++ b/tests/qemu-iotests/054 @@ -23,7 +23,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/058 b/tests/qemu-iotests/058 index 74118b93d3..01a47c6a9e 100755 --- a/tests/qemu-iotests/058 +++ b/tests/qemu-iotests/058 @@ -25,7 +25,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/059 b/tests/qemu-iotests/059 index fe16e9442d..2aa0a9eb83 100755 --- a/tests/qemu-iotests/059 +++ b/tests/qemu-iotests/059 @@ -23,7 +23,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/060 b/tests/qemu-iotests/060 index 98a946f99c..bcfa33db38 100755 --- a/tests/qemu-iotests/060 +++ b/tests/qemu-iotests/060 @@ -23,7 +23,6 @@ seq=3D"$(basename $0)" echo "QA output created by $seq" =20 -here=3D"$PWD" status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/061 b/tests/qemu-iotests/061 index 2c6da49646..03d1e5f435 100755 --- a/tests/qemu-iotests/061 +++ b/tests/qemu-iotests/061 @@ -23,7 +23,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/062 b/tests/qemu-iotests/062 index 3f97c7d6da..8ef0b9d923 100755 --- a/tests/qemu-iotests/062 +++ b/tests/qemu-iotests/062 @@ -24,7 +24,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/063 b/tests/qemu-iotests/063 index 9b8660e021..aeb247f3a7 100755 --- a/tests/qemu-iotests/063 +++ b/tests/qemu-iotests/063 @@ -24,7 +24,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/064 b/tests/qemu-iotests/064 index 40954b36d7..50214bb2c5 100755 --- a/tests/qemu-iotests/064 +++ b/tests/qemu-iotests/064 @@ -23,7 +23,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/066 b/tests/qemu-iotests/066 index 556b42bfe6..557a39f357 100755 --- a/tests/qemu-iotests/066 +++ b/tests/qemu-iotests/066 @@ -23,7 +23,6 @@ seq=3D"$(basename $0)" echo "QA output created by $seq" =20 -here=3D"$PWD" status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/067 b/tests/qemu-iotests/067 index b7a6ef2097..4a0f16c5bd 100755 --- a/tests/qemu-iotests/067 +++ b/tests/qemu-iotests/067 @@ -23,7 +23,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/068 b/tests/qemu-iotests/068 index 162cd26005..9f9fc4cb48 100755 --- a/tests/qemu-iotests/068 +++ b/tests/qemu-iotests/068 @@ -23,7 +23,6 @@ seq=3D"$(basename $0)" echo "QA output created by $seq" =20 -here=3D"$PWD" status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/069 b/tests/qemu-iotests/069 index 1f3baeea13..df3e2b0ae0 100755 --- a/tests/qemu-iotests/069 +++ b/tests/qemu-iotests/069 @@ -23,7 +23,6 @@ seq=3D"$(basename $0)" echo "QA output created by $seq" =20 -here=3D"$PWD" status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/070 b/tests/qemu-iotests/070 index 684742893c..915c02ecba 100755 --- a/tests/qemu-iotests/070 +++ b/tests/qemu-iotests/070 @@ -24,7 +24,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/071 b/tests/qemu-iotests/071 index 7b1fdf7989..865930d7b3 100755 --- a/tests/qemu-iotests/071 +++ b/tests/qemu-iotests/071 @@ -23,7 +23,6 @@ seq=3D"$(basename $0)" echo "QA output created by $seq" =20 -here=3D"$PWD" status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/072 b/tests/qemu-iotests/072 index 5d4e8becac..43cbeaf526 100755 --- a/tests/qemu-iotests/072 +++ b/tests/qemu-iotests/072 @@ -23,7 +23,6 @@ seq=3D"$(basename $0)" echo "QA output created by $seq" =20 -here=3D"$PWD" status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/073 b/tests/qemu-iotests/073 index f5be7347d1..d9819b6aa5 100755 --- a/tests/qemu-iotests/073 +++ b/tests/qemu-iotests/073 @@ -23,7 +23,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/075 b/tests/qemu-iotests/075 index b924d7a5f7..5d211b6eb3 100755 --- a/tests/qemu-iotests/075 +++ b/tests/qemu-iotests/075 @@ -23,7 +23,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/076 b/tests/qemu-iotests/076 index 64b935ad02..ddf3cf0a64 100755 --- a/tests/qemu-iotests/076 +++ b/tests/qemu-iotests/076 @@ -23,7 +23,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/077 b/tests/qemu-iotests/077 index 897afb688d..375872deed 100755 --- a/tests/qemu-iotests/077 +++ b/tests/qemu-iotests/077 @@ -23,7 +23,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/078 b/tests/qemu-iotests/078 index 36490ec94c..f9f53772d0 100755 --- a/tests/qemu-iotests/078 +++ b/tests/qemu-iotests/078 @@ -23,7 +23,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/079 b/tests/qemu-iotests/079 index d8a2a17e71..35bfab1ad7 100755 --- a/tests/qemu-iotests/079 +++ b/tests/qemu-iotests/079 @@ -23,7 +23,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/080 b/tests/qemu-iotests/080 index aa7b13776a..67998b6073 100755 --- a/tests/qemu-iotests/080 +++ b/tests/qemu-iotests/080 @@ -23,7 +23,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/081 b/tests/qemu-iotests/081 index d840841b0d..9ee474d0a7 100755 --- a/tests/qemu-iotests/081 +++ b/tests/qemu-iotests/081 @@ -23,7 +23,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 _cleanup() diff --git a/tests/qemu-iotests/082 b/tests/qemu-iotests/082 index 4f1c03b882..e0f05fe236 100755 --- a/tests/qemu-iotests/082 +++ b/tests/qemu-iotests/082 @@ -23,7 +23,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/083 b/tests/qemu-iotests/083 index 39162b36ef..b2d6462526 100755 --- a/tests/qemu-iotests/083 +++ b/tests/qemu-iotests/083 @@ -23,7 +23,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 _cleanup() diff --git a/tests/qemu-iotests/084 b/tests/qemu-iotests/084 index 3daf41615b..9b85dda50c 100755 --- a/tests/qemu-iotests/084 +++ b/tests/qemu-iotests/084 @@ -24,7 +24,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/085 b/tests/qemu-iotests/085 index 375a51e07a..adea26a781 100755 --- a/tests/qemu-iotests/085 +++ b/tests/qemu-iotests/085 @@ -28,7 +28,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 snapshot_virt0=3D"snapshot-v0.qcow2" diff --git a/tests/qemu-iotests/086 b/tests/qemu-iotests/086 index 1224e068b7..dda1bc9d07 100755 --- a/tests/qemu-iotests/086 +++ b/tests/qemu-iotests/086 @@ -23,7 +23,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/087 b/tests/qemu-iotests/087 index fb572dc5b8..1ee9b429c1 100755 --- a/tests/qemu-iotests/087 +++ b/tests/qemu-iotests/087 @@ -23,7 +23,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/088 b/tests/qemu-iotests/088 index 75e6ba9908..4bbcf47495 100755 --- a/tests/qemu-iotests/088 +++ b/tests/qemu-iotests/088 @@ -23,7 +23,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/089 b/tests/qemu-iotests/089 index dad9fcb69f..455e923440 100755 --- a/tests/qemu-iotests/089 +++ b/tests/qemu-iotests/089 @@ -23,7 +23,6 @@ seq=3D"$(basename $0)" echo "QA output created by $seq" =20 -here=3D"$PWD" status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/090 b/tests/qemu-iotests/090 index 74e14e9f00..959ed64083 100755 --- a/tests/qemu-iotests/090 +++ b/tests/qemu-iotests/090 @@ -23,7 +23,6 @@ seq=3D"$(basename $0)" echo "QA output created by $seq" =20 -here=3D"$PWD" status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/091 b/tests/qemu-iotests/091 index bb32f681bb..d6dd52fe52 100755 --- a/tests/qemu-iotests/091 +++ b/tests/qemu-iotests/091 @@ -25,7 +25,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 MIG_FIFO=3D"${TEST_DIR}/migrate" diff --git a/tests/qemu-iotests/092 b/tests/qemu-iotests/092 index 041d888984..2bf3c69a5f 100755 --- a/tests/qemu-iotests/092 +++ b/tests/qemu-iotests/092 @@ -23,7 +23,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/094 b/tests/qemu-iotests/094 index 47ff00651f..2869c26bd9 100755 --- a/tests/qemu-iotests/094 +++ b/tests/qemu-iotests/094 @@ -23,7 +23,6 @@ seq=3D"$(basename $0)" echo "QA output created by $seq" =20 -here=3D"$PWD" status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/095 b/tests/qemu-iotests/095 index bc80c019ed..41d24f9e5b 100755 --- a/tests/qemu-iotests/095 +++ b/tests/qemu-iotests/095 @@ -27,7 +27,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/097 b/tests/qemu-iotests/097 index 2a68a08358..8fce38e2ef 100755 --- a/tests/qemu-iotests/097 +++ b/tests/qemu-iotests/097 @@ -24,7 +24,6 @@ seq=3D"$(basename $0)" echo "QA output created by $seq" =20 -here=3D"$PWD" status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/098 b/tests/qemu-iotests/098 index afe5b72c87..14164dc83f 100755 --- a/tests/qemu-iotests/098 +++ b/tests/qemu-iotests/098 @@ -23,7 +23,6 @@ seq=3D"$(basename $0)" echo "QA output created by $seq" =20 -here=3D"$PWD" status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/099 b/tests/qemu-iotests/099 index ac94ca7f21..a36fe154da 100755 --- a/tests/qemu-iotests/099 +++ b/tests/qemu-iotests/099 @@ -24,7 +24,6 @@ seq=3D"$(basename $0)" echo "QA output created by $seq" =20 -here=3D"$PWD" status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/101 b/tests/qemu-iotests/101 index cc57078727..8520c771af 100755 --- a/tests/qemu-iotests/101 +++ b/tests/qemu-iotests/101 @@ -23,7 +23,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/102 b/tests/qemu-iotests/102 index 9acc2772c7..9676ce5529 100755 --- a/tests/qemu-iotests/102 +++ b/tests/qemu-iotests/102 @@ -23,7 +23,6 @@ seq=3D$(basename $0) echo "QA output created by $seq" =20 -here=3D$PWD status=3D1 # failure is the default! =20 # get standard environment, filters and qemu instance handling diff --git a/tests/qemu-iotests/103 b/tests/qemu-iotests/103 index eaab111b5a..dbff3800b7 100755 --- a/tests/qemu-iotests/103 +++ b/tests/qemu-iotests/103 @@ -23,7 +23,6 @@ seq=3D$(basename $0) echo "QA output created by $seq" =20 -here=3D$PWD status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/104 b/tests/qemu-iotests/104 index 5818b449da..f0a09daf46 100755 --- a/tests/qemu-iotests/104 +++ b/tests/qemu-iotests/104 @@ -23,7 +23,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 trap "exit \$status" 0 1 2 3 15 diff --git a/tests/qemu-iotests/105 b/tests/qemu-iotests/105 index e975f2930e..ef9ad60acf 100755 --- a/tests/qemu-iotests/105 +++ b/tests/qemu-iotests/105 @@ -23,7 +23,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/106 b/tests/qemu-iotests/106 index ee81af19da..9aef55962a 100755 --- a/tests/qemu-iotests/106 +++ b/tests/qemu-iotests/106 @@ -23,7 +23,6 @@ seq=3D$(basename $0) echo "QA output created by $seq" =20 -here=3D$PWD status=3D1 # failure is the default! =20 # get standard environment and filters diff --git a/tests/qemu-iotests/107 b/tests/qemu-iotests/107 index 87e2a22cec..baddfa9d3d 100755 --- a/tests/qemu-iotests/107 +++ b/tests/qemu-iotests/107 @@ -23,7 +23,6 @@ seq=3D"$(basename $0)" echo "QA output created by $seq" =20 -here=3D"$PWD" status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/108 b/tests/qemu-iotests/108 index 31ea282f20..c5bad010c1 100755 --- a/tests/qemu-iotests/108 +++ b/tests/qemu-iotests/108 @@ -24,7 +24,6 @@ seq=3D"$(basename $0)" echo "QA output created by $seq" =20 -here=3D"$PWD" status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/109 b/tests/qemu-iotests/109 index e011ad86c3..b96be288c0 100755 --- a/tests/qemu-iotests/109 +++ b/tests/qemu-iotests/109 @@ -23,7 +23,6 @@ seq=3D"$(basename $0)" echo "QA output created by $seq" =20 -here=3D"$PWD" status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/110 b/tests/qemu-iotests/110 index e596efddb5..211b7a40eb 100755 --- a/tests/qemu-iotests/110 +++ b/tests/qemu-iotests/110 @@ -23,7 +23,6 @@ seq=3D"$(basename $0)" echo "QA output created by $seq" =20 -here=3D"$PWD" status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/111 b/tests/qemu-iotests/111 index 37223d93d7..2da9ba57cf 100755 --- a/tests/qemu-iotests/111 +++ b/tests/qemu-iotests/111 @@ -24,7 +24,6 @@ seq=3D"$(basename $0)" echo "QA output created by $seq" =20 -here=3D"$PWD" status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/112 b/tests/qemu-iotests/112 index 221892fbd1..72e35b3803 100755 --- a/tests/qemu-iotests/112 +++ b/tests/qemu-iotests/112 @@ -23,7 +23,6 @@ seq=3D"$(basename $0)" echo "QA output created by $seq" =20 -here=3D"$PWD" status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/113 b/tests/qemu-iotests/113 index 9d48020b94..2567ba4596 100755 --- a/tests/qemu-iotests/113 +++ b/tests/qemu-iotests/113 @@ -24,7 +24,6 @@ seq=3D"$(basename $0)" echo "QA output created by $seq" =20 -here=3D"$PWD" status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/114 b/tests/qemu-iotests/114 index 44ef79a87f..a1cb2ec2c8 100755 --- a/tests/qemu-iotests/114 +++ b/tests/qemu-iotests/114 @@ -23,7 +23,6 @@ seq=3D"$(basename $0)" echo "QA output created by $seq" =20 -here=3D"$PWD" status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/115 b/tests/qemu-iotests/115 index f2ec8fbd44..54c657a424 100755 --- a/tests/qemu-iotests/115 +++ b/tests/qemu-iotests/115 @@ -23,7 +23,6 @@ seq=3D"$(basename $0)" echo "QA output created by $seq" =20 -here=3D"$PWD" status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/116 b/tests/qemu-iotests/116 index 715a44200f..8d13d2443e 100755 --- a/tests/qemu-iotests/116 +++ b/tests/qemu-iotests/116 @@ -26,7 +26,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/117 b/tests/qemu-iotests/117 index 07aca0eba1..c725b1d710 100755 --- a/tests/qemu-iotests/117 +++ b/tests/qemu-iotests/117 @@ -23,7 +23,6 @@ seq=3D"$(basename $0)" echo "QA output created by $seq" =20 -here=3D"$PWD" status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/119 b/tests/qemu-iotests/119 index dbc7350458..3a0120872c 100755 --- a/tests/qemu-iotests/119 +++ b/tests/qemu-iotests/119 @@ -24,7 +24,6 @@ seq=3D"$(basename $0)" echo "QA output created by $seq" =20 -here=3D"$PWD" status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/120 b/tests/qemu-iotests/120 index 3816260951..70efb29a2c 100755 --- a/tests/qemu-iotests/120 +++ b/tests/qemu-iotests/120 @@ -24,7 +24,6 @@ seq=3D"$(basename $0)" echo "QA output created by $seq" =20 -here=3D"$PWD" status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/121 b/tests/qemu-iotests/121 index 04b38c9de8..103c5170ca 100755 --- a/tests/qemu-iotests/121 +++ b/tests/qemu-iotests/121 @@ -23,7 +23,6 @@ seq=3D"$(basename $0)" echo "QA output created by $seq" =20 -here=3D"$PWD" status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/122 b/tests/qemu-iotests/122 index ea4ba0f098..27f5cc0977 100755 --- a/tests/qemu-iotests/122 +++ b/tests/qemu-iotests/122 @@ -23,7 +23,6 @@ seq=3D"$(basename $0)" echo "QA output created by $seq" =20 -here=3D"$PWD" status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/123 b/tests/qemu-iotests/123 index 6701c7ab54..1755300a12 100755 --- a/tests/qemu-iotests/123 +++ b/tests/qemu-iotests/123 @@ -23,7 +23,6 @@ seq=3D"$(basename $0)" echo "QA output created by $seq" =20 -here=3D"$PWD" status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/125 b/tests/qemu-iotests/125 index 6a0504ba0a..45b0b109e0 100755 --- a/tests/qemu-iotests/125 +++ b/tests/qemu-iotests/125 @@ -23,7 +23,6 @@ seq=3D$(basename $0) echo "QA output created by $seq" =20 -here=3D$PWD status=3D1 # failure is the default! =20 # get standard environment and filters diff --git a/tests/qemu-iotests/126 b/tests/qemu-iotests/126 index 882ace0191..497a8f1d8f 100755 --- a/tests/qemu-iotests/126 +++ b/tests/qemu-iotests/126 @@ -24,7 +24,6 @@ seq=3D"$(basename $0)" echo "QA output created by $seq" =20 -here=3D"$PWD" status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/127 b/tests/qemu-iotests/127 index e84f0d80f6..d9366d37b1 100755 --- a/tests/qemu-iotests/127 +++ b/tests/qemu-iotests/127 @@ -23,7 +23,6 @@ seq=3D$(basename $0) echo "QA output created by $seq" =20 -here=3D$PWD status=3D1 # failure is the default! =20 # get standard environment, filters and qemu instance handling diff --git a/tests/qemu-iotests/128 b/tests/qemu-iotests/128 index 51009f18f6..9529df3dfd 100755 --- a/tests/qemu-iotests/128 +++ b/tests/qemu-iotests/128 @@ -23,7 +23,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 devname=3D"eiodev$$" diff --git a/tests/qemu-iotests/130 b/tests/qemu-iotests/130 index ed234c3b6d..f507a7ed7f 100755 --- a/tests/qemu-iotests/130 +++ b/tests/qemu-iotests/130 @@ -25,7 +25,6 @@ seq=3D"$(basename $0)" echo "QA output created by $seq" =20 -here=3D"$PWD" status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/131 b/tests/qemu-iotests/131 index 9c12d6c7f9..c809d3f8aa 100755 --- a/tests/qemu-iotests/131 +++ b/tests/qemu-iotests/131 @@ -23,7 +23,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/133 b/tests/qemu-iotests/133 index 61adc4374b..0f1dd4e5b3 100755 --- a/tests/qemu-iotests/133 +++ b/tests/qemu-iotests/133 @@ -23,7 +23,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/134 b/tests/qemu-iotests/134 index c1c45c66d6..57c5fdbab1 100755 --- a/tests/qemu-iotests/134 +++ b/tests/qemu-iotests/134 @@ -23,7 +23,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/135 b/tests/qemu-iotests/135 index 5c41718490..86f8aefa2a 100755 --- a/tests/qemu-iotests/135 +++ b/tests/qemu-iotests/135 @@ -23,7 +23,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/137 b/tests/qemu-iotests/137 index 1e6c6afcca..93f5c7ebaf 100755 --- a/tests/qemu-iotests/137 +++ b/tests/qemu-iotests/137 @@ -23,7 +23,6 @@ seq=3D"$(basename $0)" echo "QA output created by $seq" =20 -here=3D"$PWD" status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/138 b/tests/qemu-iotests/138 index cb98fc34b9..c5a0c85e94 100755 --- a/tests/qemu-iotests/138 +++ b/tests/qemu-iotests/138 @@ -23,7 +23,6 @@ seq=3D"$(basename $0)" echo "QA output created by $seq" =20 -here=3D"$PWD" status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/140 b/tests/qemu-iotests/140 index 63390fd896..55969e80f9 100755 --- a/tests/qemu-iotests/140 +++ b/tests/qemu-iotests/140 @@ -27,7 +27,6 @@ seq=3D"$(basename $0)" echo "QA output created by $seq" =20 -here=3D"$PWD" status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/141 b/tests/qemu-iotests/141 index 996bf16963..db79f457a7 100755 --- a/tests/qemu-iotests/141 +++ b/tests/qemu-iotests/141 @@ -23,7 +23,6 @@ seq=3D"$(basename $0)" echo "QA output created by $seq" =20 -here=3D"$PWD" status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/142 b/tests/qemu-iotests/142 index 6cb73bc6fa..93fd649a14 100755 --- a/tests/qemu-iotests/142 +++ b/tests/qemu-iotests/142 @@ -23,7 +23,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/143 b/tests/qemu-iotests/143 index 1ae5296607..727c703182 100755 --- a/tests/qemu-iotests/143 +++ b/tests/qemu-iotests/143 @@ -23,7 +23,6 @@ seq=3D"$(basename $0)" echo "QA output created by $seq" =20 -here=3D"$PWD" status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/144 b/tests/qemu-iotests/144 index d6015ce0eb..fc3e044012 100755 --- a/tests/qemu-iotests/144 +++ b/tests/qemu-iotests/144 @@ -25,7 +25,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 TMP_SNAP1=3D${TEST_DIR}/tmp.qcow2 diff --git a/tests/qemu-iotests/145 b/tests/qemu-iotests/145 index c81bbb8a20..3806f0e6be 100755 --- a/tests/qemu-iotests/145 +++ b/tests/qemu-iotests/145 @@ -23,7 +23,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/146 b/tests/qemu-iotests/146 index 238658d642..5276a31cc3 100755 --- a/tests/qemu-iotests/146 +++ b/tests/qemu-iotests/146 @@ -23,7 +23,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/150 b/tests/qemu-iotests/150 index 6c5d54228b..65c32cf73b 100755 --- a/tests/qemu-iotests/150 +++ b/tests/qemu-iotests/150 @@ -23,7 +23,6 @@ seq=3D"$(basename $0)" echo "QA output created by $seq" =20 -here=3D"$PWD" status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/153 b/tests/qemu-iotests/153 index 54f3ad8c79..2a7bdad8c5 100755 --- a/tests/qemu-iotests/153 +++ b/tests/qemu-iotests/153 @@ -23,7 +23,6 @@ seq=3D"$(basename $0)" echo "QA output created by $seq" =20 -here=3D"$PWD" tmp=3D/tmp/$$ status=3D1 # failure is the default! =20 diff --git a/tests/qemu-iotests/154 b/tests/qemu-iotests/154 index 7b56d60339..b536c49887 100755 --- a/tests/qemu-iotests/154 +++ b/tests/qemu-iotests/154 @@ -23,7 +23,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/156 b/tests/qemu-iotests/156 index 618060180c..1fc4eab021 100755 --- a/tests/qemu-iotests/156 +++ b/tests/qemu-iotests/156 @@ -31,7 +31,6 @@ seq=3D"$(basename $0)" echo "QA output created by $seq" =20 -here=3D"$PWD" status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/157 b/tests/qemu-iotests/157 index c44edd65e7..cdc96e9746 100755 --- a/tests/qemu-iotests/157 +++ b/tests/qemu-iotests/157 @@ -23,7 +23,6 @@ seq=3D"$(basename $0)" echo "QA output created by $seq" =20 -here=3D"$PWD" status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/158 b/tests/qemu-iotests/158 index abf79f3cc2..08db8c95c0 100755 --- a/tests/qemu-iotests/158 +++ b/tests/qemu-iotests/158 @@ -23,7 +23,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/159 b/tests/qemu-iotests/159 index 799ff57040..d6fb17da2e 100755 --- a/tests/qemu-iotests/159 +++ b/tests/qemu-iotests/159 @@ -23,7 +23,6 @@ seq=3D"$(basename $0)" echo "QA output created by $seq" =20 -here=3D"$PWD" status=3D1 =20 . ./common.rc diff --git a/tests/qemu-iotests/160 b/tests/qemu-iotests/160 index 41ffad5774..4a16bfb0bb 100755 --- a/tests/qemu-iotests/160 +++ b/tests/qemu-iotests/160 @@ -23,7 +23,6 @@ seq=3D"$(basename $0)" echo "QA output created by $seq" =20 -here=3D"$PWD" status=3D1 =20 . ./common.rc diff --git a/tests/qemu-iotests/162 b/tests/qemu-iotests/162 index c601c13525..b435024c70 100755 --- a/tests/qemu-iotests/162 +++ b/tests/qemu-iotests/162 @@ -24,7 +24,6 @@ seq=3D"$(basename $0)" echo "QA output created by $seq" =20 -here=3D"$PWD" status=3D1 # failure is the default! =20 _cleanup() diff --git a/tests/qemu-iotests/170 b/tests/qemu-iotests/170 index 736c61f8e9..b76473f3b9 100755 --- a/tests/qemu-iotests/170 +++ b/tests/qemu-iotests/170 @@ -23,7 +23,6 @@ seq=3D"$(basename $0)" echo "QA output created by $seq" =20 -here=3D"$PWD" status=3D1 =20 . ./common.rc diff --git a/tests/qemu-iotests/171 b/tests/qemu-iotests/171 index 93b119939d..e5c83af2e6 100755 --- a/tests/qemu-iotests/171 +++ b/tests/qemu-iotests/171 @@ -24,7 +24,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/172 b/tests/qemu-iotests/172 index 56376f0f37..0133691f9b 100755 --- a/tests/qemu-iotests/172 +++ b/tests/qemu-iotests/172 @@ -23,7 +23,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/173 b/tests/qemu-iotests/173 index f5185a1945..8214b3b999 100755 --- a/tests/qemu-iotests/173 +++ b/tests/qemu-iotests/173 @@ -24,7 +24,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/174 b/tests/qemu-iotests/174 index b1527583c7..504efe318b 100755 --- a/tests/qemu-iotests/174 +++ b/tests/qemu-iotests/174 @@ -23,7 +23,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/175 b/tests/qemu-iotests/175 index b9703dd99c..298cc6465a 100755 --- a/tests/qemu-iotests/175 +++ b/tests/qemu-iotests/175 @@ -23,7 +23,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/176 b/tests/qemu-iotests/176 index 9f4a5db86a..273ed2c12f 100755 --- a/tests/qemu-iotests/176 +++ b/tests/qemu-iotests/176 @@ -27,7 +27,6 @@ seq=3D"$(basename $0)" echo "QA output created by $seq" =20 -here=3D"$PWD" status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/177 b/tests/qemu-iotests/177 index 2c0c70ec6d..d3216cd5fb 100755 --- a/tests/qemu-iotests/177 +++ b/tests/qemu-iotests/177 @@ -23,7 +23,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/178 b/tests/qemu-iotests/178 index 4eba90243d..3dbb15fd77 100755 --- a/tests/qemu-iotests/178 +++ b/tests/qemu-iotests/178 @@ -23,7 +23,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/179 b/tests/qemu-iotests/179 index ccede3bc04..50d1c35380 100755 --- a/tests/qemu-iotests/179 +++ b/tests/qemu-iotests/179 @@ -23,7 +23,6 @@ seq=3D"$(basename $0)" echo "QA output created by $seq" =20 -here=3D"$PWD" status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/181 b/tests/qemu-iotests/181 index cd90eb98c5..e8f19ac868 100755 --- a/tests/qemu-iotests/181 +++ b/tests/qemu-iotests/181 @@ -23,7 +23,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 MIG_SOCKET=3D"${TEST_DIR}/migrate" diff --git a/tests/qemu-iotests/182 b/tests/qemu-iotests/182 index f7705b36f7..17396c0816 100755 --- a/tests/qemu-iotests/182 +++ b/tests/qemu-iotests/182 @@ -23,7 +23,6 @@ seq=3D"$(basename $0)" echo "QA output created by $seq" =20 -here=3D"$PWD" tmp=3D/tmp/$$ status=3D1 # failure is the default! =20 diff --git a/tests/qemu-iotests/183 b/tests/qemu-iotests/183 index ced0df4a76..bb7c5b7093 100755 --- a/tests/qemu-iotests/183 +++ b/tests/qemu-iotests/183 @@ -23,7 +23,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 MIG_SOCKET=3D"${TEST_DIR}/migrate" diff --git a/tests/qemu-iotests/184 b/tests/qemu-iotests/184 index c5d0226a67..93f19df963 100755 --- a/tests/qemu-iotests/184 +++ b/tests/qemu-iotests/184 @@ -23,7 +23,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/185 b/tests/qemu-iotests/185 index 09ebe6b659..2ebca91503 100755 --- a/tests/qemu-iotests/185 +++ b/tests/qemu-iotests/185 @@ -23,7 +23,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 MIG_SOCKET=3D"${TEST_DIR}/migrate" diff --git a/tests/qemu-iotests/186 b/tests/qemu-iotests/186 index a87a7f81ff..f25548b9bf 100755 --- a/tests/qemu-iotests/186 +++ b/tests/qemu-iotests/186 @@ -23,7 +23,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/187 b/tests/qemu-iotests/187 index 4d304f91ca..158f650f7c 100755 --- a/tests/qemu-iotests/187 +++ b/tests/qemu-iotests/187 @@ -23,7 +23,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/188 b/tests/qemu-iotests/188 index 6e945ccf38..ddcbecadc0 100755 --- a/tests/qemu-iotests/188 +++ b/tests/qemu-iotests/188 @@ -23,7 +23,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/189 b/tests/qemu-iotests/189 index 5213057b14..cefa774818 100755 --- a/tests/qemu-iotests/189 +++ b/tests/qemu-iotests/189 @@ -23,7 +23,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/190 b/tests/qemu-iotests/190 index 577bbb70f7..4f0b6711a2 100755 --- a/tests/qemu-iotests/190 +++ b/tests/qemu-iotests/190 @@ -23,7 +23,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/191 b/tests/qemu-iotests/191 index 0f740f7b38..0337bedd00 100755 --- a/tests/qemu-iotests/191 +++ b/tests/qemu-iotests/191 @@ -23,7 +23,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 MIG_SOCKET=3D"${TEST_DIR}/migrate" diff --git a/tests/qemu-iotests/192 b/tests/qemu-iotests/192 index 5d0af35816..d6209c9d92 100755 --- a/tests/qemu-iotests/192 +++ b/tests/qemu-iotests/192 @@ -24,7 +24,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/195 b/tests/qemu-iotests/195 index ff6b1fde9d..fe88617eed 100755 --- a/tests/qemu-iotests/195 +++ b/tests/qemu-iotests/195 @@ -23,7 +23,6 @@ seq=3D`basename $0` echo "QA output created by $seq" =20 -here=3D`pwd` status=3D1 # failure is the default! =20 # get standard environment, filters and checks diff --git a/tests/qemu-iotests/197 b/tests/qemu-iotests/197 index 9fb4a694a1..9e7c6cf339 100755 --- a/tests/qemu-iotests/197 +++ b/tests/qemu-iotests/197 @@ -23,7 +23,6 @@ seq=3D"$(basename $0)" echo "QA output created by $seq" =20 -here=3D"$PWD" status=3D1 # failure is the default! =20 # get standard environment, filters and checks --=20 2.13.6 From nobody Sat May 4 14:04:10 2024 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; 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 (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 151085431221392.13483012111169; Thu, 16 Nov 2017 09:45:12 -0800 (PST) Received: from localhost ([::1]:42168 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eFODe-0004IE-8j for importer@patchew.org; Thu, 16 Nov 2017 12:44:54 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59902) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eFO7g-0007df-PV for qemu-devel@nongnu.org; Thu, 16 Nov 2017 12:38:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eFO7e-0003Up-G7 for qemu-devel@nongnu.org; Thu, 16 Nov 2017 12:38:44 -0500 Received: from mx1.redhat.com ([209.132.183.28]:42826) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eFO7Y-00039Z-2V; Thu, 16 Nov 2017 12:38:36 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id F3508356E8; Thu, 16 Nov 2017 17:38:34 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-120-124.rdu2.redhat.com [10.10.120.124]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1266960602; Thu, 16 Nov 2017 17:38:33 +0000 (UTC) From: Cleber Rosa To: qemu-devel@nongnu.org Date: Thu, 16 Nov 2017 12:38:10 -0500 Message-Id: <20171116173810.16457-11-crosa@redhat.com> In-Reply-To: <20171116173810.16457-1-crosa@redhat.com> References: <20171116173810.16457-1-crosa@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Thu, 16 Nov 2017 17:38:35 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 10/10] qemu-iotests: add section on how to write a new I/O test 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: Kevin Wolf , Cleber Rosa , qemu-block@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This adds some basic information on how to write a new test. I'm aware that some of the information in the wiki (Testing/QemuIoTests) could also belong here. Since copying content over won't generate much interesting feedback, the goal here is to get feedback on the sample_test_templates, general workflow proposed for writing a new test, etc. After feedback is received, I can go over and sync both sides (wiki and README). Signed-off-by: Cleber Rosa --- tests/qemu-iotests/README | 44 ++++++++++++++-- tests/qemu-iotests/sample_test_templates/sample.py | 59 ++++++++++++++++++= ++++ tests/qemu-iotests/sample_test_templates/sample.sh | 40 +++++++++++++++ 3 files changed, 138 insertions(+), 5 deletions(-) create mode 100755 tests/qemu-iotests/sample_test_templates/sample.py create mode 100755 tests/qemu-iotests/sample_test_templates/sample.sh diff --git a/tests/qemu-iotests/README b/tests/qemu-iotests/README index 6079b401ae..efaf72d5e7 100644 --- a/tests/qemu-iotests/README +++ b/tests/qemu-iotests/README @@ -1,20 +1,54 @@ +=3D This is the QEMU I/O test suite =3D =20 -=3D=3D=3D This is the QEMU I/O test suite =3D=3D=3D - -* Intro +=3D=3D Intro =3D=3D =20 This package contains a simple test suite for the I/O layer of qemu. It does not require a guest, but only the qemu, qemu-img and qemu-io binaries. This does limit it to exercise the low-level I/O path only but no actual block drivers like ide, scsi or virtio. =20 -* Usage +=3D=3D Usage =3D=3D =20 Just run ./check to run all tests for the raw image format, or ./check -qcow2 to test the qcow2 image format. The output of ./check -h explains additional options to test further image formats or I/O methods. =20 -* Feedback and patches +=3D=3D Writing a QEMU I/O test =3D=3D + +It's a common practice to start with an existing test that may relate +to the task you have. QEMU I/O tests are usually written either in +shell or Python, so it's also a good idea to pick an existing test +based on your familiarity with those languages and/or what you +anticipate about your test. + +You can find templates available at "sample_test_templates/", or you +can start with an existing test, such as 001 (shell based) or 030 +(Python based). + +After you pick your template, name it as a three-digits file, starting +with the next available one. If `ls -1 ??? | sort -rn | head -1` gives +you "197", name your test "198". Finally, add an entry to the "group" +file, which manages just that, test group classification, allowing a +user to run all "quick" tests, for instance. + +=3D=3D=3D Test configuration, expected results and reporting =3D=3D=3D + +The tests are (mostly) standard executable files, that are executed by +"./check" as such. Tests get most of their configuration (directly or +indirectly) by environment variables. Some of the framework auxiliary +code (for instance, "common.rc") defines or changes some of the +environment variables. You'll come across tests that reference +"$TEST_IMG", "$QEMU_IO" and other variables. + +The expected results for a test are stored in a file named after the +(sequential) test number. For test 001, the expected output (stdout + +stderr) is stored at 001.out. + +Tests that finish successfully should exit with status code 0. To be +considered a successful run, a test must also produce output that +matches what is recorded in the expected output file (say, 001.out). + +=3D=3D Feedback and patches =3D=3D =20 Please send improvements to the test suite, general feedback or just reports of failing tests cases to qemu-devel@nongnu.org with a CC: diff --git a/tests/qemu-iotests/sample_test_templates/sample.py b/tests/qem= u-iotests/sample_test_templates/sample.py new file mode 100755 index 0000000000..35a7410b5c --- /dev/null +++ b/tests/qemu-iotests/sample_test_templates/sample.py @@ -0,0 +1,59 @@ +#!/usr/bin/env python +# +# DESCRIPTION HERE, such as "Test a complex thing using a simple thing" +# +# COPYRIGHT NOTICE HERE, such as "Copyright (C) YYYY Yourself, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# +# Creator/Owner: your.email@example.com +# + +import iotests + + +class Sample(iotests.QMPTestCase): + + def setUp(self): + """ + Method that runs before test method(s). Use it to prepare the + environment that is common to the all tests, but doesn't + necessarily mean that is part of the feature testing + specifics. + + Remove this docstring unless you have a really good use for it. + """ + pass + + def tearDown(self): + """ + Method that runs after the test method(s). Use it to clean up + the environment created previously in setUp(). + + Remove this docstring unless you have a really good use for it. + """ + pass + + def test(self): + """ + Test code goes here, or in any other method whose name starts + with "test". + + It's a good idea to describe what it's about. + """ + pass + + +if __name__ =3D=3D '__main__': + iotests.main() diff --git a/tests/qemu-iotests/sample_test_templates/sample.sh b/tests/qem= u-iotests/sample_test_templates/sample.sh new file mode 100755 index 0000000000..d50e228efc --- /dev/null +++ b/tests/qemu-iotests/sample_test_templates/sample.sh @@ -0,0 +1,40 @@ +#!/bin/bash +# +# DESCRIPTION HERE, such as "Test a complex thing using a simple thing" +# +# COPYRIGHT NOTICE HERE, such as "Copyright (C) YYYY Yourself, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# +# Creator/Owner: your.email@example.com +# + +seq=3D`basename $0` +echo "QA output created by $seq" + +status=3D1 # failure is the default! + +# get standard environment, filters and checks +. ./common.rc + +# describe supported environment, and then remove this line. + _supported_fmt generic + _supported_proto generic + _supported_os Linux + +# put your test code goes here, and then remove this line. + +# success, all done +echo "*** done" +status=3D0 --=20 2.13.6