From nobody Thu May 16 19:38:38 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=1559571087; cv=none; d=zoho.com; s=zohoarc; b=ALkiqRUmUfjnzyx23vITRl81Y0NkVhJbnEsE6eZm9COMVeL1lJlF4LcyzEXWxI6qCMcU5hi0/Uf4JXTMykSVxF7WwUVSlhPuJ+PsCkcv+8taXz5kz0bkt8GSREm4o/WGoh4IEobjQPogn06MO+GAMU1eJ3aZbogiSs1o+/WnGYY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1559571087; 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=AYobFZLx/HeJsGQJVMTHrBaOCDLesZBMmZm0g5/Jp5U=; b=eatnHxyNZeeF3lvgSFkz4M1exI6JgMqdXi3a6FGVMC314vQhC51ec7unOJqUbD8o3MuMnGm9DqhDFBFgcm8NezoPYcbI24+CfkmqlnsW7rlWz32ZdWtGSJVWSPdugQKsBAEOOjcXqoRStnNFXAnYpS/fKCCC04Tm0xKPodGyiVA= 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 1559571087885420.50370886131157; Mon, 3 Jun 2019 07:11:27 -0700 (PDT) Received: from localhost ([127.0.0.1]:35701 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hXngG-00047L-U0 for importer@patchew.org; Mon, 03 Jun 2019 10:11:20 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54631) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hXnc5-0000Su-7o for qemu-devel@nongnu.org; Mon, 03 Jun 2019 10:07:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hXnL1-0005jj-D6 for qemu-devel@nongnu.org; Mon, 03 Jun 2019 09:49:24 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44018) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hXnL0-0005fV-57; Mon, 03 Jun 2019 09:49:22 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id F11095F72C; Mon, 3 Jun 2019 13:49:12 +0000 (UTC) Received: from linux.fritz.box.com (ovpn-116-129.ams2.redhat.com [10.36.116.129]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8D4735D71A; Mon, 3 Jun 2019 13:49:10 +0000 (UTC) From: Kevin Wolf To: qemu-block@nongnu.org Date: Mon, 3 Jun 2019 15:48:57 +0200 Message-Id: <20190603134857.32359-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Mon, 03 Jun 2019 13:49:18 +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] iotests: Fix duplicated diff output on failure X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, alex.bennee@linaro.org, qemu-devel@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" Commit 70ff5b07 wanted to move the diff between actual and reference output to the end after printing the test result line. It really only copied it, though, so the diff is now displayed twice. Remove the old one. Fixes: 70ff5b07fcdd378180ad2d5cc0b0d5e67e7ef325 Signed-off-by: Kevin Wolf --- tests/qemu-iotests/check | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check index 95162c6cf9..44ebf24080 100755 --- a/tests/qemu-iotests/check +++ b/tests/qemu-iotests/check @@ -876,7 +876,6 @@ do fi else mv $tmp.out $seq.out.bad - $diff -w "$reference" "$PWD"/$seq.out.bad status=3D"fail" results=3D"output mismatch (see $seq.out.bad)" printdiff=3Dtrue --=20 2.20.1