From 5de886ca747e4117599ce6b002dc5ce05ae2e75f Mon Sep 17 00:00:00 2001 From: Jani Nikula Date: Tue, 4 Dec 2012 23:26:33 +0200 Subject: [PATCH] [PATCH 3/3] test: use perl instead of sed -r for portability --- c1/c3b4153d135f2c2a894a16bbe46fcd660bb870 | 90 +++++++++++++++++++++++ 1 file changed, 90 insertions(+) create mode 100644 c1/c3b4153d135f2c2a894a16bbe46fcd660bb870 diff --git a/c1/c3b4153d135f2c2a894a16bbe46fcd660bb870 b/c1/c3b4153d135f2c2a894a16bbe46fcd660bb870 new file mode 100644 index 000000000..9412bf5a7 --- /dev/null +++ b/c1/c3b4153d135f2c2a894a16bbe46fcd660bb870 @@ -0,0 +1,90 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 949F5431FD7 + for ; Tue, 4 Dec 2012 13:26:54 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" +X-Spam-Flag: NO +X-Spam-Score: -0.7 +X-Spam-Level: +X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 + tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id ZgFlycgZlCCd for ; + Tue, 4 Dec 2012 13:26:53 -0800 (PST) +Received: from mail-lb0-f181.google.com (mail-lb0-f181.google.com + [209.85.217.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id C0CBC431FAE + for ; Tue, 4 Dec 2012 13:26:46 -0800 (PST) +Received: by mail-lb0-f181.google.com with SMTP id ge1so3919540lbb.26 + for ; Tue, 04 Dec 2012 13:26:46 -0800 (PST) +X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=google.com; s=20120113; + h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references + :in-reply-to:references:x-gm-message-state; + bh=1YCjnPULKAsfcmuI0eJiI5wguwnceYczbHF6z+mdCXs=; + b=SSjkj9KeDOOdqicE44fMPD7XkQB/9Wr6Yl+Q7UQ25PQcjlp/ma4kau8eDuM+8vhzWW + RdfSbG8WOhKw9Gcqq+b9808amMWWJRpxaEUTITUabQvnQCqSGsQMdkijVuM4cY6CpBzH + /olGKg7YWxTlPKsL76PZ+Z4yyzvFOflnTmtMHEzn5i7HOZ3pMCOj8MTCYgtMDcvckd3V + 0oa1TMDOMt2xfQBKAjv9TlngnIyymmjHTcMyOPxe4Aywn43illfO2Qo7fh+MWjvmZDY4 + iTU7jysdT497cip+RKxCiS+ZP8JGH/XXWVgIHadfHxnFKmD/hu0JFVcYy5HkKjmKI9IX + 8c8g== +Received: by 10.152.104.77 with SMTP id gc13mr14236384lab.16.1354656406357; + Tue, 04 Dec 2012 13:26:46 -0800 (PST) +Received: from localhost (dsl-hkibrasgw4-fe51df00-27.dhcp.inet.fi. + [80.223.81.27]) + by mx.google.com with ESMTPS id v6sm1272780lbf.11.2012.12.04.13.26.44 + (version=SSLv3 cipher=OTHER); Tue, 04 Dec 2012 13:26:45 -0800 (PST) +From: Jani Nikula +To: notmuch@notmuchmail.org +Subject: [PATCH 3/3] test: use perl instead of sed -r for portability +Date: Tue, 4 Dec 2012 23:26:33 +0200 +Message-Id: + <66f7d91d6d2425149b5f4063274a6402662b9257.1354656085.git.jani@nikula.org> +X-Mailer: git-send-email 1.7.10.4 +In-Reply-To: +References: +In-Reply-To: +References: +X-Gm-Message-State: + ALoCoQlnTHUncg6aCSrnLfNDsSVUauHaCpOZyAMfovqk71PaLQxhTPa3+QeFGUp06w3xU/jaEhpy +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Tue, 04 Dec 2012 21:26:55 -0000 + +Our OS X users report -r is not a supported option for sed. Use perl +instead. +--- + test/test-lib.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/test/test-lib.sh b/test/test-lib.sh +index f169785..31ed107 100644 +--- a/test/test-lib.sh ++++ b/test/test-lib.sh +@@ -576,7 +576,7 @@ NOTMUCH_NEW () + + notmuch_search_sanitize () + { +- sed -r -e 's/("?thread"?: ?)("?)................("?)/\1\2XXX\3/' ++ perl -pe 's/("?thread"?: ?)("?)................("?)/\1\2XXX\3/' + } + + NOTMUCH_SHOW_FILENAME_SQUELCH='s,filename:.*/mail,filename:/XXX/mail,' +-- +1.7.10.4 + -- 2.26.2