All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jay Soffian <jaysoffian@gmail.com>
To: git@vger.kernel.org
Cc: Jay Soffian <jaysoffian@gmail.com>,
	Tay Ray Chuan <rctay89@gmail.com>,
	Junio C Hamano <gitster@pobox.com>
Subject: [PATCH v2] t5540-http-push.sh: avoid non-portable grep -P
Date: Thu, 26 Feb 2009 16:41:10 -0500	[thread overview]
Message-ID: <1235684470-6184-1-git-send-email-jaysoffian@gmail.com> (raw)
In-Reply-To: <7vwsbdq6u4.fsf@gitster.siamese.dyndns.org>

OS X's GNU grep does not support -P/--perl-regexp; use basic REs instead.

Signed-off-by: Jay Soffian <jaysoffian@gmail.com>
---
 t/t5540-http-push.sh |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/t/t5540-http-push.sh b/t/t5540-http-push.sh
index 11b3432..a2e9384 100755
--- a/t/t5540-http-push.sh
+++ b/t/t5540-http-push.sh
@@ -94,10 +94,15 @@ test_expect_success 'MKCOL sends directory names with trailing slashes' '
 
 '
 
-test_expect_success 'PUT and MOVE sends object to URLs with SHA-1 hash suffix' '
+x1="[0-9a-z]"
+x2="$x1$x1"
+x5="$x1$x1$x1$x1$x1"
+x38="$x5$x5$x5$x5$x5$x5$x5$x1$x1$x1"
+x40="$x38$x2"
 
-	grep -P "\"(?:PUT|MOVE) .+objects/[\da-z]{2}/[\da-z]{38}_[\da-z\-]{40} HTTP/[0-9.]+\" 20\d" \
-		< "$HTTPD_ROOT_PATH"/access.log
+test_expect_success 'PUT and MOVE sends object to URLs with SHA-1 hash suffix' '
+	sed -e "s/PUT/OP/" -e "s/MOVE/OP/" < "$HTTPD_ROOT_PATH"/access.log \
+	| grep "\"OP .\{1,\}objects/$x2/${x38}_$x40 HTTP/[0-9.]\{1,\}\" 20[0-9]"
 
 '
 
-- 
1.6.2.rc1.309.g5f417

      parent reply	other threads:[~2009-02-26 21:42 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-02-26 19:49 [PATCH] t5540-http-push.sh: avoid non-portable grep -P Jay Soffian
2009-02-26 20:30 ` Junio C Hamano
2009-02-26 20:43   ` Jay Soffian
2009-02-26 20:46     ` Jay Soffian
2009-02-26 21:48     ` Junio C Hamano
2009-02-26 22:19       ` Jay Soffian
2009-02-26 22:37         ` Junio C Hamano
2009-02-26 22:40           ` Jay Soffian
2009-02-26 22:45             ` [PATCH v3] " Jay Soffian
2009-02-26 23:29             ` [PATCH] " Junio C Hamano
2009-02-26 23:40               ` Jay Soffian
2009-02-26 23:44               ` [PATCH v4] " Jay Soffian
2009-02-26 23:51               ` [PATCH] " Brandon Casey
2009-02-26 23:58                 ` Johannes Schindelin
2009-02-27  0:12                   ` Brandon Casey
2009-02-27  0:24                     ` Junio C Hamano
2009-02-26 21:41   ` Jay Soffian [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1235684470-6184-1-git-send-email-jaysoffian@gmail.com \
    --to=jaysoffian@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=rctay89@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.