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 <gitster@pobox.com> Signed-off-by: Brian Gernhardt <brian@gernhardtsoftware.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Brian Gernhardt committed
Aug 29, 2011 at 02:42 UTC
f6918da789b07fabbc82e189d0bac50a79622828
1 file changed
+6
-2
t/t5540-http-push.sh
+6
-2
@@ -132,8 +132,12 @@ x38="$x5$x5$x5$x5$x5$x5$x5$x1$x1$x1"
132
x40="$x38$x2"
133
134
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] "
141
142
'
143