Re: [PATCH 3/3] test: use perl instead of sed -r for portability
authorMichal Nazarewicz <mina86@mina86.com>
Tue, 4 Dec 2012 23:01:07 +0000 (00:01 +0100)
committerW. Trevor King <wking@tremily.us>
Fri, 7 Nov 2014 17:51:29 +0000 (09:51 -0800)
be/368bc33749d6d722e60882af58347da3739640 [new file with mode: 0644]

diff --git a/be/368bc33749d6d722e60882af58347da3739640 b/be/368bc33749d6d722e60882af58347da3739640
new file mode 100644 (file)
index 0000000..95e42ec
--- /dev/null
@@ -0,0 +1,154 @@
+Return-Path: <mpn@google.com>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 7A1FD431FB6\r
+       for <notmuch@notmuchmail.org>; Tue,  4 Dec 2012 15:01:20 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_LOW=-0.7]\r
+       autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id gtcBIt2a2Fmo for <notmuch@notmuchmail.org>;\r
+       Tue,  4 Dec 2012 15:01:16 -0800 (PST)\r
+Received: from mail-ee0-f53.google.com (mail-ee0-f53.google.com\r
+ [74.125.83.53])       (using TLSv1 with cipher RC4-SHA (128/128 bits))        (No client\r
+ certificate requested)        by olra.theworths.org (Postfix) with ESMTPS id\r
+ D85DB431FAE   for <notmuch@notmuchmail.org>; Tue,  4 Dec 2012 15:01:15 -0800\r
+ (PST)\r
+Received: by mail-ee0-f53.google.com with SMTP id c50so2974935eek.26\r
+       for <notmuch@notmuchmail.org>; Tue, 04 Dec 2012 15:01:14 -0800 (PST)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com;\r
+ s=20120113;   h=sender:from:to:subject:in-reply-to:organization:references\r
+       :user-agent:x-face:face:x-pgp:x-pgp-fp:date:message-id:mime-version\r
+       :content-type; bh=noPlzYDUl21+Gcq8HIjGG4MzCXOcus/z1liyk+YMVrs=;\r
+       b=gohI9eRHX3DPx6XNNnCl3c9PY5Bz0PN9n2lZwszzGr6l8Tw8KdonAD/iGaUYx5JcE+\r
+       F+xbczJg2j7eN7qycpLq/HiVn0Z46msbl28fMWn6yADT+gBljxfhMQNBCnO6WIm1YiRS\r
+       KW+SIMVRxamglEGp3sEwRN9PrOrUAX0zs7UmIbCSJ6tnGjjfifXgEY/kXLw3bVCUjc/x\r
+       KqXFcu34oc8CD/sG42pO4+EW4/Bnjc5EyiPCaLKsUAoHuZVNpVYo5LapOJQRBibaldsI\r
+       fZdj6aeVeEk/H9lStOLajg/Iw40o9+6SpqJQCMyNR6VfvRHn/q7f/DHRpxGJKDMUdVJN    NSwg==\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+       d=google.com; s=20120113;\r
+       h=sender:from:to:subject:in-reply-to:organization:references\r
+       :user-agent:x-face:face:x-pgp:x-pgp-fp:date:message-id:mime-version\r
+       :content-type:x-gm-message-state;\r
+       bh=noPlzYDUl21+Gcq8HIjGG4MzCXOcus/z1liyk+YMVrs=;\r
+       b=Sv99uKgmefZUoaMFtvjFnQg58VTmAfA7IZVrQGOUqO8NmmGzuV4HO5M8nSM3RYk/4c\r
+       I7Z7dHUquF27QS/DAob9ZU3IxyjoeGOlSPUi4jS3Vo7dpOhQulMJSRDDitIsZnqUwlvG\r
+       Qw0RHlk8OY57nvLGlYlYYB4P6p9Sa55TSPOB+xVrNbO6+CaqRebmpMvI/n2yac/jiax7\r
+       GcabXLYMS4kqNNmm1DpA9ZUpWcHmBV/BySnId2NkUmVg+Vm7uHU2h83iUJxnrQAs6AAM\r
+       WFZpkq2ZoKv8tcpNvR/NIQV3VLwkiJJX5szO6n7rKUXZeTQPoJccvf9w2NSYW6qgkL93\r
+       Sk5Q==\r
+Received: by 10.14.207.6 with SMTP id m6mr53433381eeo.10.1354662074659;\r
+       Tue, 04 Dec 2012 15:01:14 -0800 (PST)\r
+Received: from mpn-glaptop ([2620:0:105f:5:8c95:2fd8:feb2:1f3c])\r
+       by mx.google.com with ESMTPS id f49sm5410027eep.12.2012.12.04.15.01.13\r
+       (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Tue, 04 Dec 2012 15:01:13 -0800 (PST)\r
+Sender: Michal Nazarewicz <mpn@google.com>\r
+From: Michal Nazarewicz <mina86@mina86.com>\r
+To: Jani Nikula <jani@nikula.org>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH 3/3] test: use perl instead of sed -r for portability\r
+In-Reply-To:\r
+ <66f7d91d6d2425149b5f4063274a6402662b9257.1354656085.git.jani@nikula.org>\r
+Organization: http://mina86.com/\r
+References: <cover.1354656085.git.jani@nikula.org>\r
+       <66f7d91d6d2425149b5f4063274a6402662b9257.1354656085.git.jani@nikula.org>\r
+User-Agent: Notmuch/ (http://notmuchmail.org) Emacs/24.2.50.1\r
+       (x86_64-unknown-linux-gnu)\r
+X-Face: PbkBB1w#)bOqd`iCe"Ds{e+!C7`pkC9a|f)Qo^BMQvy\q5x3?vDQJeN(DS?|-^$uMti[3D*#^_Ts"pU$jBQLq~Ud6iNwAw_r_o_4]|JO?]}P_}Nc&"p#D(ZgUb4uCNPe7~a[DbPG0T~!&c.y$Ur,=N4RT>]dNpd;       KFrfMCylc}gc??'U2j,!8%xdD\r
+Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAAJFBMVEWbfGlUPDDHgE57V0jUupKjgIObY0PLrom9mH4dFRK4gmjPs41MxjOgAAACQElEQVQ4jW3TMWvbQBQHcBk1xE6WyALX1069oZBMlq+ouUwpEQQ6uRjttkWP4CmBgGM0BQLBdPFZYPsyFUo6uEtKDQ7oy/U96XR2Ux8ehH/89Z6enqxBcS7Lg81jmSuujrfCZcLI/TYYvbGj+jbgFpHJ/bqQAUISj8iLyu4LuFHJTosxsucO4jSDNE0Hq3hwK/ceQ5sx97b8LcUDsILfk+ovHkOIsMbBfg43VuQ5Ln9YAGCkUdKJoXR9EclFBhixy3EGVz1K6eEkhxCAkeMMnqoAhAKwhoUJkDrCqvbecaYINlFKSRS1i12VKH1XpUd4qxL876EkMcDvHj3s5RBajHHMlA5iK32e0C7VgG0RlzFPvoYHZLRmAC0BmNcBruhkE0KsMsbEc62ZwUJDxWUdMsMhVqovoT96i/DnX/ASvz/6hbCabELLk/6FF/8PNpPCGqcZTGFcBhhAaZZDbQPaAB3+KrWWy2XgbYDNIinkdWAFcCpraDE/knwe5DBqGmgzESl1p2E4MWAz0VUPgYYzmfWb9yS4vCvgsxJriNTHoIBz5YteBvg+VGISQWUqhMiByPIPpygeDBE6elD973xWwKkEiHZAHKjhuPsFnBuArrzxtakRcISv+XMIPl4aGBUJm8Emk7qBYU8IlgNEIpiJhk/No24jHwkKTFHDWfPniR4iw5vJaw2nzSjfq2zffcE/GDjRC2dn0J0XwPAbDL84TvaFCJEU4Oml9pRyEUhR3Cl2t01AoEjRbs0sYugp14/4X5n4pU4EHHnMAAAAAElFTkSuQmCC\r
+X-PGP: 50751FF4\r
+X-PGP-FP: AC1F 5F5C D418 88F8 CC84 5858 2060 4012 5075 1FF4\r
+Date: Wed, 05 Dec 2012 00:01:07 +0100\r
+Message-ID: <xa1tip8h2zik.fsf@mina86.com>\r
+MIME-Version: 1.0\r
+Content-Type: multipart/mixed; boundary="=-=-="\r
+X-Gm-Message-State: ALoCoQmNXrnf/Fe0iAoxlu+qMBmPgX5C98vNSvo8O/sNAZCckd/zc49aQfykO1JHQUGnq4EckJQ7w5Kc2xmji0EnGVPcX3CihOzjVWrsV30Keysu3UJnqE7arbjsTkLpBH9fTN6eCtjp+6SzROTHpwjgqxuEhSP+BoFzZXIN0wooNlYEaFhTOxflEeui5hpXUR17dU07I0VtUp8NQ0eVospFPuBlminXqw==\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Tue, 04 Dec 2012 23:01:20 -0000\r
+\r
+--=-=-=\r
+Content-Type: text/plain; charset=utf-8\r
+Content-Transfer-Encoding: quoted-printable\r
+\r
+On Tue, Dec 04 2012, Jani Nikula wrote:\r
+> Our OS X users report -r is not a supported option for sed. Use perl\r
+> instead.\r
+> ---\r
+>  test/test-lib.sh |    2 +-\r
+>  1 file changed, 1 insertion(+), 1 deletion(-)\r
+>\r
+> diff --git a/test/test-lib.sh b/test/test-lib.sh\r
+> index f169785..31ed107 100644\r
+> --- a/test/test-lib.sh\r
+> +++ b/test/test-lib.sh\r
+> @@ -576,7 +576,7 @@ NOTMUCH_NEW ()\r
+>=20=20\r
+>  notmuch_search_sanitize ()\r
+>  {\r
+> -    sed -r -e 's/("?thread"?: ?)("?)................("?)/\1\2XXX\3/'\r
+> +    perl -pe 's/("?thread"?: ?)("?)................("?)/\1\2XXX\3/'\r
+\r
+Alternatively, this could just be convert into a basic regexp:\r
+\r
+sed -e 's/\("\?thread"\?: \?"\?\)................\("\?\)/\1XXX\2/'\r
+\r
+which I think is even more portable, no?\r
+\r
+>  }\r
+>=20=20\r
+>  NOTMUCH_SHOW_FILENAME_SQUELCH=3D's,filename:.*/mail,filename:/XXX/mail,'\r
+\r
+--=20\r
+Best regards,                                         _     _\r
+.o. | Liege of Serenely Enlightened Majesty of      o' \,=3D./ `o\r
+..o | Computer Science,  Micha=C5=82 =E2=80=9Cmina86=E2=80=9D Nazarewicz   =\r
+ (o o)\r
+ooo +----<email/xmpp: mpn@google.com>--------------ooO--(_)--Ooo--\r
+--=-=-=\r
+Content-Type: multipart/signed; boundary="==-=-=";\r
+       micalg=pgp-sha1; protocol="application/pgp-signature"\r
+\r
+--==-=-=\r
+Content-Type: text/plain\r
+\r
+\r
+--==-=-=\r
+Content-Type: application/pgp-signature\r
+\r
+-----BEGIN PGP SIGNATURE-----\r
+Version: GnuPG v1.4.11 (GNU/Linux)\r
+\r
+iQIcBAEBAgAGBQJQvoCzAAoJECBgQBJQdR/0ZK8P/3+hH1xnbfy66eTYJQiIQquo\r
+tnfeDsTk1PXj6AhmIWmeTs4h4fMKMrtPzC324KaVkf09bYeu0G7btMIGEMHK3IjX\r
+l5O27/U1GmcW6a9s+T8deTin1jjml4SUoRSqC+kzUeCkOHUePoipYGD4ptH95vWe\r
+/eGbnkYGufZbr20CU1hsht8IHvpAPR/i8dJV2Np6eAOS8+buQJ824+049YC3mt27\r
+Euyr1a+ZSFPdV+ln9OASQ9uG6MCPC5K7sJl2u3BIyedMzOZM64Ul6vK10xkVrdwp\r
+EdMBE9Rqkuo83rf5cPAIa0ZLR2BvdZpmatf0L89fg74jHCQ/C7PkxM3feVGtcyCJ\r
+yHVVg8blbsBDv2GLxpdJ89DGbieM61dMH/8d96jlm+3BRbJKR9K0RcJ1p4kZDZ6Q\r
+JIaEeyTM25sy5HHHz12U3BIcWptHP/Fo7K++HZ0QO+p1H74lilYrAmrxPYEIb0v5\r
+zTeGHn46+Ywd1J4FEEipYQl9lEMUXoqbIMCnWXUg74cj1rQyfm/94u1y2pqrbef0\r
+A4WzIBlIyR2X4htk0IOImxozxf12n4411rk9sOVaeU1Qz1KGVeAsXKKDmXeX02Fm\r
+Btzfst/RyN6D6AKY+7JG0WUJxzCPZnHfwpBzTa8tv8TeBo9e+FC1GZGwP1DF9Qc4\r
+E0JhvM7uVUSD9IVr5NRf\r
+=EPBj\r
+-----END PGP SIGNATURE-----\r
+--==-=-=--\r
+\r
+--=-=-=--\r