Skip to content

Commit f6918da

Browse files
Benabikgitster
authored andcommitted
t5540-http-test: shorten grep pattern
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 <[email protected]> Signed-off-by: Brian Gernhardt <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 6a7f71d commit f6918da

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

t/t5540-http-push.sh

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,12 @@ x38="$x5$x5$x5$x5$x5$x5$x5$x1$x1$x1"
132132
x40="$x38$x2"
133133

134134
test_expect_success 'PUT and MOVE sends object to URLs with SHA-1 hash suffix' '
135-
sed -e "s/PUT /OP /" -e "s/MOVE /OP /" "$HTTPD_ROOT_PATH"/access.log |
136-
grep -e "\"OP .*/objects/$x2/${x38}_$x40 HTTP/[.0-9]*\" 20[0-9] "
135+
sed \
136+
-e "s/PUT /OP /" \
137+
-e "s/MOVE /OP /" \
138+
-e "s|/objects/$x2/${x38}_$x40|WANTED_PATH_REQUEST|" \
139+
"$HTTPD_ROOT_PATH"/access.log |
140+
grep -e "\"OP .*WANTED_PATH_REQUEST HTTP/[.0-9]*\" 20[0-9] "
137141
138142
'
139143

0 commit comments

Comments
 (0)