From: Brian Gernhardt Date: Mon, 21 Oct 2013 17:54:12 +0000 (-0400) Subject: t5570: Update for clone-progress-to-stderr branch X-Git-Tag: v1.8.5-rc0~1^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d619cfc7490481652833dff820e04263869c8861;p=git t5570: Update for clone-progress-to-stderr branch git clone now reports its progress to standard error, which throws off t5570. Using test_i18ngrep instead of test_cmp allows the test to be more flexible by only looking for the expected error and ignoring any other output from the program. Signed-off-by: Brian Gernhardt Signed-off-by: Junio C Hamano --- diff --git a/t/t5570-git-daemon.sh b/t/t5570-git-daemon.sh index f01edffa3c..1309702ba4 100755 --- a/t/t5570-git-daemon.sh +++ b/t/t5570-git-daemon.sh @@ -122,8 +122,7 @@ test_remote_error() fi test_must_fail git "$cmd" "$GIT_DAEMON_URL/$repo" "$@" 2>output && - echo "fatal: remote error: $msg: /$repo" >expect && - test_cmp expect output + test_i18ngrep "fatal: remote error: $msg: /$repo" output && ret=$? chmod +x "$GIT_DAEMON_DOCUMENT_ROOT_PATH/repo.git" (exit $ret)