From nobody Sat May 18 21:45:28 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.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 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1554929119; cv=none; d=zoho.com; s=zohoarc; b=fs96nSidkHzvVq6IiLiUi8GqjhScbU+V5CB3mDpdXHWMYHEaRGx5Il/btAtOTbQDjHf+rBVQTJUTbuqXXp4pnjtu2THsKveiu8t+Ml8RkaMOpy6WxorkXr+0O/fFvP2jG+BH8oQuXAnUlqYZKP/hTcJLIYrtoUnz85xTdjPVo0U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1554929119; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=ya5HhEJOJU0N/lD2RJ+qctXq06eVO+9U+8wH9V5fneQ=; b=fNZZKBGsDXaeu6GBhPMIZxa6ufU6dikVQhVgmZ86ACX8Km/rvq+j8i0KUOp04yBCgzrzxCA93lGkInjRkyQd/dfdEWokR+uqQhTOzjtV8cuCFRtEX/hlJvqrBJQxlUaDwgIQpm10M8ovCTGKKpuKgIe8ICo7SH5/PzomzWmxQ8Y= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1554929119673864.8542610258081; Wed, 10 Apr 2019 13:45:19 -0700 (PDT) Received: from localhost ([127.0.0.1]:37613 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEK5p-0003fp-SE for importer@patchew.org; Wed, 10 Apr 2019 16:45:13 -0400 Received: from eggs.gnu.org ([209.51.188.92]:39998) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEK4q-0003AK-48 for qemu-devel@nongnu.org; Wed, 10 Apr 2019 16:44:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hEK4o-0000QN-De for qemu-devel@nongnu.org; Wed, 10 Apr 2019 16:44:11 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48900) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hEK4a-0000HP-HY; Wed, 10 Apr 2019 16:43:58 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C493D30254A0; Wed, 10 Apr 2019 20:43:49 +0000 (UTC) Received: from blue.redhat.com (ovpn-117-110.phx2.redhat.com [10.3.117.110]) by smtp.corp.redhat.com (Postfix) with ESMTP id 94C565D9CD; Wed, 10 Apr 2019 20:43:46 +0000 (UTC) From: Eric Blake To: qemu-devel@nongnu.org Date: Wed, 10 Apr 2019 15:42:17 -0500 Message-Id: <20190410204215.5963-1-eblake@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Wed, 10 Apr 2019 20:43:49 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH for-4.0?] iotest: Fix 241 to run in generic directory 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 , vsementsov@virtuozzo.com, John Snow , qemu-block@nongnu.org, mreitz@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Filter the qemu-nbd server output to get rid of a direct reference to my build directory. Fixes: e9dce9cb Reported-by: Max Reitz Signed-off-by: Eric Blake Reviewed-by: Vladimir Sementsov-Ogievskiy --- Not worth -rc4 on its own, but if something else pops up that requires another spin, I plan on a pull request for this one. Otherwise it slips to 4.1, and 4.0 just has a broken iotest. tests/qemu-iotests/241 | 4 +++- tests/qemu-iotests/241.out | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/qemu-iotests/241 b/tests/qemu-iotests/241 index 4b196857387..017a736aaba 100755 --- a/tests/qemu-iotests/241 +++ b/tests/qemu-iotests/241 @@ -28,6 +28,7 @@ nbd_unix_socket=3D$TEST_DIR/test_qemu_nbd_socket _cleanup() { _cleanup_test_img + rm -f "$TEST_DIR/server.log" nbd_server_stop } trap "_cleanup; exit \$status" 0 1 2 3 15 @@ -69,12 +70,13 @@ echo # Intentionally omit '-f' to force image probing, which in turn forces # sector alignment, here at the server. -nbd_server_start_unix_socket "$TEST_IMG_FILE" +nbd_server_start_unix_socket "$TEST_IMG_FILE" 2> "$TEST_DIR/server.log" $QEMU_NBD_PROG --list -k $nbd_unix_socket | grep '\(size\|min\)' $QEMU_IMG map -f raw --output=3Djson "$TEST_IMG" | _filter_qemu_img_map $QEMU_IO -f raw -c map "$TEST_IMG" nbd_server_stop +cat "$TEST_DIR/server.log" | _filter_testdir echo echo "=3D=3D=3D Exporting unaligned raw image, forced client sector alignm= ent =3D=3D=3D" diff --git a/tests/qemu-iotests/241.out b/tests/qemu-iotests/241.out index f481074a02e..75f9f465e52 100644 --- a/tests/qemu-iotests/241.out +++ b/tests/qemu-iotests/241.out @@ -10,13 +10,13 @@ QA output created by 241 =3D=3D=3D Exporting unaligned raw image, forced server sector alignment = =3D=3D=3D -WARNING: Image format was not specified for '/home/eblake/qemu/tests/qemu-= iotests/scratch/t.raw' and probing guessed raw. - 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. size: 1024 min block: 512 [{ "start": 0, "length": 1024, "depth": 0, "zero": false, "data": true, "o= ffset": OFFSET}] 1 KiB (0x400) bytes allocated at offset 0 bytes (0x0) +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, w= rite operations on block 0 will be restricted. + Specify the 'raw' format explicitly to remove the restrictions. =3D=3D=3D Exporting unaligned raw image, forced client sector alignment = =3D=3D=3D --=20 2.20.1