From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59754) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V6N0x-0004LV-8Q for qemu-devel@nongnu.org; Mon, 05 Aug 2013 11:48:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V6N0s-0005Au-9r for qemu-devel@nongnu.org; Mon, 05 Aug 2013 11:48:07 -0400 Received: from mx1.redhat.com ([209.132.183.28]:22678) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V6N0s-0005Aa-1u for qemu-devel@nongnu.org; Mon, 05 Aug 2013 11:48:02 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r75Fm1PU003191 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 5 Aug 2013 11:48:01 -0400 Message-ID: <51FFC930.8010306@redhat.com> Date: Mon, 05 Aug 2013 09:48:00 -0600 From: Eric Blake MIME-Version: 1.0 References: <1375707618-916-1-git-send-email-stefanha@redhat.com> In-Reply-To: <1375707618-916-1-git-send-email-stefanha@redhat.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="c3tVJ5SjwOmSj35cproiJjJavQRG3thmW" Subject: Re: [Qemu-devel] [PATCH for-1.6] qemu-iotests: filter QEMU version in monitor banner List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Stefan Hajnoczi Cc: Kevin Wolf , qemu-devel@nongnu.org This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --c3tVJ5SjwOmSj35cproiJjJavQRG3thmW Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On 08/05/2013 07:00 AM, Stefan Hajnoczi wrote: > Filter out the QEMU monitor version banner so that tests do not break > when the QEMU version number is changed. >=20 > Signed-off-by: Stefan Hajnoczi > --- > +++ b/tests/qemu-iotests/common.filter > @@ -155,7 +155,8 @@ _filter_qemu_io() > # replace occurrences of QEMU_PROG with "qemu" > _filter_qemu() > { > - sed -e "s#\\(^\\|(qemu) \\)$(basename $QEMU_PROG):#\1QEMU_PROG:#" > + sed -e "s#\\(^\\|(qemu) \\)$(basename $QEMU_PROG):#\1QEMU_PROG:#" = \ > + -e 's#^QEMU [0-9]\+\.[0-9]\+\.[0-9]\+ monitor#QEMU X.Y.Z monit= or#' The concept is right, but \+ is a GNU sed-ism, which is not portable to all versions of sed. Better would be: -e 's#^QEMU [0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]* mon#QEMU X.Y.Z mon#' --=20 Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org --c3tVJ5SjwOmSj35cproiJjJavQRG3thmW Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.13 (GNU/Linux) Comment: Public key at http://people.redhat.com/eblake/eblake.gpg Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQEcBAEBCAAGBQJR/8kwAAoJEKeha0olJ0NqwXYIAI8BkkxZFDioh6Vk286z8VoI 2f3pJ6u+Iod2r5GwFSps7EGQs8ZaOmSJB4XYiqYQqol8PWL5YeEs0vWMGjCK0Z+O Q0yliBZj/D5kA+KLHsViTEPypxaMjj2X9qgUaBUv2MBFY0vJV8rcNdNKKTKwpdgJ Elru1xvlWJM4Tb+mM/dFnBHJdc3hr2qPrsMBBWGCkcpgTyL4W0NyHmJNI2tq1LU9 6Id4LWJYXOdJmOqDntlIIBmqjRq3iyOQtXV9UQ/k5G7L+biVGMDt+15BXQ/BfSBL g7ju4/r/WPHoY8wu9lUOFvWeudX6oGw8owFid2sdgXxC5shaid3tnDuzT1GU6GE= =GrTT -----END PGP SIGNATURE----- --c3tVJ5SjwOmSj35cproiJjJavQRG3thmW--