From: Pat Thoyts <patthoyts@users.sourceforge.net>
To: Git <git@vger.kernel.org>
Cc: Junio C Hamano <gitster@pobox.com>,
msysGit <msysgit@googlegroups.com>,
Pat Thoyts <patthoyts@users.sourceforge.net>
Subject: [PATCH 4/7] t9901: fix line-ending dependency on windows
Date: Sat, 15 Oct 2011 15:05:17 +0100 [thread overview]
Message-ID: <1318687520-19522-5-git-send-email-patthoyts@users.sourceforge.net> (raw)
In-Reply-To: <1318687520-19522-1-git-send-email-patthoyts@users.sourceforge.net>
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
---
t/t9901-git-web--browse.sh | 32 +++++++++++++++++---------------
1 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/t/t9901-git-web--browse.sh b/t/t9901-git-web--browse.sh
index 7906e5d..69513f1 100755
--- a/t/t9901-git-web--browse.sh
+++ b/t/t9901-git-web--browse.sh
@@ -7,31 +7,35 @@ 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 +47,8 @@ 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 +61,8 @@ 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
--
1.7.7.1.gbba15
next prev parent reply other threads:[~2011-10-15 14:05 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-15 14:05 [PATCH 0/7] Some patches from msysGit (round 2) Pat Thoyts
2011-10-15 14:05 ` [PATCH 1/7] t1020: disable the pwd test on MinGW Pat Thoyts
2011-10-15 14:05 ` [PATCH 2/7] t9001: do not fail only due to CR/LF issues Pat Thoyts
2011-10-15 14:05 ` [PATCH 3/7] git-svn: On MSYS, escape and quote SVN_SSH also if set by the user Pat Thoyts
2011-10-15 14:05 ` Pat Thoyts [this message]
2011-10-15 14:05 ` [PATCH 5/7] t9300: do not run --cat-blob-fd related tests on MinGW Pat Thoyts
2011-10-15 14:05 ` [PATCH 6/7] mergetools: use the correct tool for Beyond Compare 3 on Windows Pat Thoyts
2011-10-15 14:05 ` [PATCH 7/7] mingw: ensure sockets are initialized before calling gethostname Pat Thoyts
2011-10-16 5:17 ` [PATCH 0/7] Some patches from msysGit (round 2) Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1318687520-19522-5-git-send-email-patthoyts@users.sourceforge.net \
--to=patthoyts@users.sourceforge.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=msysgit@googlegroups.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).