diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-02-19 13:18:08 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-02-19 13:18:08 -0800 |
| commit | 455d0beb1393618b5ab32cc6ea671aa32c6ab1d8 (patch) | |
| tree | 9fad1f6acf354bb1bdefe83c60704e5d948a86d8 | |
| parent | ca1b4116483b397e78483376296bcd23916ab553 (diff) | |
| parent | 0539071b1e998248ba89cb5117a57cd13d83aefb (diff) | |
| download | git-455d0beb1393618b5ab32cc6ea671aa32c6ab1d8.tar.gz | |
Merge branch 'mk/t5562-do-not-reuse-output-files'
* mk/t5562-do-not-reuse-output-files:
t5562: do not reuse output files
| -rwxr-xr-x | t/t5562-http-backend-content-length.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/t/t5562-http-backend-content-length.sh b/t/t5562-http-backend-content-length.sh index bbadde2c6e..f36c7f4f9d 100755 --- a/t/t5562-http-backend-content-length.sh +++ b/t/t5562-http-backend-content-length.sh @@ -8,12 +8,12 @@ test_lazy_prereq GZIP 'gzip --version' verify_http_result() { # some fatal errors still produce status 200 # so check if there is the error message - if grep 'fatal:' act.err + if grep 'fatal:' act.err.$test_count then return 1 fi - if ! grep "Status" act.out >act + if ! grep "Status" act.out.$test_count >act then printf "Status: 200 OK\r\n" >act fi @@ -33,7 +33,7 @@ test_http_env() { REQUEST_METHOD=POST \ "$PERL_PATH" \ "$TEST_DIRECTORY"/t5562/invoke-with-content-length.pl \ - "$request_body" git http-backend >act.out 2>act.err + "$request_body" git http-backend >act.out.$test_count 2>act.err.$test_count } ssize_b100dots() { @@ -161,7 +161,7 @@ test_expect_success 'empty CONTENT_LENGTH' ' GIT_HTTP_EXPORT_ALL=TRUE \ REQUEST_METHOD=GET \ CONTENT_LENGTH="" \ - git http-backend <empty_body >act.out 2>act.err && + git http-backend <empty_body >act.out.$test_count 2>act.err.$test_count && verify_http_result "200 OK" ' |