Skip to content

Commit

Permalink
t5540-http-test: shorten grep pattern
Browse files Browse the repository at this point in the history
On OS X, the grep pattern

    "\"OP .*/objects/$x2/X38_X40 HTTP/[.0-9]*\" 20[0-9] "

is too long ($x38 and $x40 represent 38 and 40 copies of [0-9a-f]) for
grep to handle.  In order to still be able to match this, use the sed
invocation to replace what we're looking for with a token.

Improved-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Brian Gernhardt <brian@gernhardtsoftware.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Brian Gernhardt authored and Junio C Hamano committed Aug 29, 2011
1 parent 6a7f71d commit f6918da
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions t/t5540-http-push.sh
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,12 @@ x38="$x5$x5$x5$x5$x5$x5$x5$x1$x1$x1"
x40="$x38$x2"

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 -e "\"OP .*/objects/$x2/${x38}_$x40 HTTP/[.0-9]*\" 20[0-9] "
sed \
-e "s/PUT /OP /" \
-e "s/MOVE /OP /" \
-e "s|/objects/$x2/${x38}_$x40|WANTED_PATH_REQUEST|" \
"$HTTPD_ROOT_PATH"/access.log |
grep -e "\"OP .*WANTED_PATH_REQUEST HTTP/[.0-9]*\" 20[0-9] "
'

Expand Down

0 comments on commit f6918da

Please sign in to comment.