diff options
| author |  Pat Thoyts <patthoyts@users.sourceforge.net> | 2011-10-15 15:05:17 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-10-15 20:17:32 -0700 |
| commit | f64943d242d3b0fff40684d09033f17bb9747a38 (patch) | |
| tree | 04945ae2c4ab48362f460061c912d510230f2034 | |
| parent | mingw: ensure sockets are initialized before calling gethostname (diff) | |
| download | tgif-f64943d242d3b0fff40684d09033f17bb9747a38.tar.xz | |
t9901: fix line-ending dependency on windows
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/t9901-git-web--browse.sh | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/t/t9901-git-web--browse.sh b/t/t9901-git-web--browse.sh index 7906e5d032..b0a6bad8dd 100755 --- a/t/t9901-git-web--browse.sh +++ b/t/t9901-git-web--browse.sh @@ -7,31 +7,32 @@ This test checks that git web--browse can handle various valid URLs.' . ./test-lib.sh +test_web_browse () { + # browser=$1 url=$2 + git web--browse --browser="$1" "$2" >actual && + tr -d '\015' <actual >text && + test_cmp expect text +} + test_expect_success \ 'URL with an ampersand in it' ' echo http://example.com/foo\&bar >expect && git config browser.custom.cmd echo && - git web--browse --browser=custom \ - http://example.com/foo\&bar >actual && - test_cmp expect actual + test_web_browse custom http://example.com/foo\&bar ' test_expect_success \ 'URL with a semi-colon in it' ' echo http://example.com/foo\;bar >expect && git config browser.custom.cmd echo && - git web--browse --browser=custom \ - http://example.com/foo\;bar >actual && - test_cmp expect actual + test_web_browse custom http://example.com/foo\;bar ' test_expect_success \ 'URL with a hash in it' ' echo http://example.com/foo#bar >expect && git config browser.custom.cmd echo && - git web--browse --browser=custom \ - http://example.com/foo#bar >actual && - test_cmp expect actual + test_web_browse custom http://example.com/foo#bar ' test_expect_success \ @@ -43,9 +44,7 @@ test_expect_success \ EOF chmod +x "fake browser" && git config browser.w3m.path "`pwd`/fake browser" && - git web--browse --browser=w3m \ - http://example.com/foo >actual && - test_cmp expect actual + test_web_browse w3m http://example.com/foo ' test_expect_success \ @@ -58,9 +57,7 @@ test_expect_success \ done } f" && - git web--browse --browser=custom \ - http://example.com/foo >actual && - test_cmp expect actual + test_web_browse custom http://example.com/foo ' test_done |