From nobody Fri May 3 07:39:48 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1564752468; cv=none; d=zoho.com; s=zohoarc; b=X3Vz78NGz5SM2VLXbkw+50QZhD7AJnYuMmNTsdsYaeFCw2fIY9wjqfLjhmrAnDmJbjDLcDDA9mmViY6Ndnz5dTR8TpnywT11ZbCJcYdFEmRVKLmilBY5f8XlmeW/nPiWvaA84wvSaW+/aYKBm20OSCRWlUYD5tTefB/OZ7sgD10= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1564752468; h=Content-Type: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=n/yZyzcGtUDcQo4SdNq+xnVAy5z0fFUwaElLBaKx0Eo=; b=M0nF8SeLgcSWY7YSd4ytlaWP2/DxdJeaB+HDHIUk0RBbkYcQJt6nJuvJmhfDQU1ZmEu7L9YTnKWBCWa35x1XuuIAnY9Swmbe3ZmZ+9rFzSRF8uqnUfF7GGayhJsHQr65ddUJGYHmALOm+VnHbwJcFVpjs4WNgyxz3axgMcLX47Y= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1564752468884957.3079935770534; Fri, 2 Aug 2019 06:27:48 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 55A77C024906; Fri, 2 Aug 2019 13:27:47 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D792F19C68; Fri, 2 Aug 2019 13:27:44 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 18A181800204; Fri, 2 Aug 2019 13:27:42 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x72DRext030270 for ; Fri, 2 Aug 2019 09:27:40 -0400 Received: by smtp.corp.redhat.com (Postfix) id E45311001B03; Fri, 2 Aug 2019 13:27:40 +0000 (UTC) Received: from blue.redhat.com (ovpn-116-93.phx2.redhat.com [10.3.116.93]) by smtp.corp.redhat.com (Postfix) with ESMTP id 996FC1001B02; Fri, 2 Aug 2019 13:27:38 +0000 (UTC) From: Eric Blake To: libvir-list@redhat.com Date: Fri, 2 Aug 2019 08:27:33 -0500 Message-Id: <20190802132733.17761-1-eblake@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza Subject: [libvirt] [PATCH] tests: Fix virsh-snapshot/checkpoint without libreadline-devel X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Fri, 02 Aug 2019 13:27:48 +0000 (UTC) Content-Type: text/plain; charset="utf-8" libreadline-devel is an optional build dependency; when it is not present, the output of 'virsh < Signed-off-by: Eric Blake Tested-by: Daniel Henrique Barboza --- I'm tempted to push this as a fix to a build-breaker, but as I did not actually build without libreadline-devel, I'd appreciate an ACK from Daniel that this fixes the problem on his setup. tests/virsh-checkpoint | 7 +++---- tests/virsh-snapshot | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/tests/virsh-checkpoint b/tests/virsh-checkpoint index 75bdc293be..92962d2205 100755 --- a/tests/virsh-checkpoint +++ b/tests/virsh-checkpoint @@ -140,7 +140,7 @@ EOF compare exp err || fail=3D1 # Restore state with redefine -$abs_top_builddir/tools/virsh -c test:///default >out 2>err <out 2>err ' # Redefine must be in topological order; this will fail checkpoint-create test --redefine c2.xml echo --err marker @@ -149,7 +149,7 @@ $abs_top_builddir/tools/virsh -c test:///default >out 2= >err < exp || fail=3D1 @@ -165,8 +165,7 @@ Children: 0 Descendants: 0 EOF -sed '1,/^virsh #/d; /virsh #/d' < out > out.cooked || fail=3D1 -compare exp out.cooked || fail=3D1 +compare exp out || fail=3D1 cat < exp || fail=3D1 error: invalid argument: parent c3 for moment c2 not found diff --git a/tests/virsh-snapshot b/tests/virsh-snapshot index 20ff966a51..473e3b3f2d 100755 --- a/tests/virsh-snapshot +++ b/tests/virsh-snapshot @@ -191,7 +191,7 @@ EOF compare exp err || fail=3D1 # Restore state with redefine -$abs_top_builddir/tools/virsh -c test:///default >out 2>err <out 2>err ' # Redefine must be in topological order; this will fail snapshot-create test --redefine s2.xml --validate echo --err marker @@ -199,7 +199,7 @@ $abs_top_builddir/tools/virsh -c test:///default >out 2= >err < exp || fail=3D1 @@ -217,8 +217,7 @@ Descendants: 0 Metadata: yes EOF -sed '1,/^virsh #/d; /virsh #/d' < out > out.cooked || fail=3D1 -compare exp out.cooked || fail=3D1 +compare exp out || fail=3D1 cat < exp || fail=3D1 error: invalid argument: parent s3 for moment s2 not found --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list