t5540-http-push.sh: avoid non-portable grep -P

OS X's GNU grep does not support -P/--perl-regexp. We use a basic RE instead, and simplify the pattern slightly by replacing '+' with '*' so it can be more easily expressed using a basic RE. The important part of pattern, checking for a SHA-1 has suffix in the successful PUT/MOVE operations, remains the same. Also, a-z instead of a-f was an obvious mistake in the original RE. Here are samples of what we want to match: 127.0.0.1 - - [26/Feb/2009:22:38:13 +0000] "PUT /test_repo.git/objects/3e/a4fbb9e18a401a6463c595d08118fcb9fb7426_fab55116904c665a95438bcc78521444a7db6096 HTTP/1.1" 201 277 127.0.0.1 - - [26/Feb/2009:22:38:13 +0000] "MOVE /test_repo.git/objects/3e/a4fbb9e18a401a6463c595d08118fcb9fb7426_fab55116904c665a95438bcc78521444a7db6096 HTTP/1.1" 201 277 Signed-off-by: Jay Soffian <jaysoffian@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jay Soffian committed Feb 26, 2009 at 18:44 UTC 2591838beece01f98773109a7c6932525be2d144

1 file changed +8 -3

t/t5540-http-push.sh

+8 -3

@@ -94,10 +94,15 @@ test_expect_success 'MKCOL sends directory names with trailing slashes' '

95 '

97 -test_expect_success 'PUT and MOVE sends object to URLs with SHA-1 hash suffix' '

97 +x1="[0-9a-f]"

98 +x2="$x1$x1"

99 +x5="$x1$x1$x1$x1$x1"

100 +x38="$x5$x5$x5$x5$x5$x5$x5$x1$x1$x1"

101 +x40="$x38$x2"

102

99 - grep -P "\"(?:PUT|MOVE) .+objects/[\da-z]{2}/[\da-z]{38}_[\da-z\-]{40} HTTP/[0-9.]+\" 20\d" \

100 - < "$HTTPD_ROOT_PATH"/access.log

103 +test_expect_success 'PUT and MOVE sends object to URLs with SHA-1 hash suffix' '

104 + sed -e "s/PUT /OP /" -e "s/MOVE /OP /" "$HTTPD_ROOT_PATH"/access.log |

105 + grep -e "\"OP .*/objects/$x2/${x38}_$x40 HTTP/[.0-9]*\" 20[0-9] "

106

107 '

108