From: John Keeping <john@keeping.me.uk>
To: git@vger.kernel.org
Cc: Johannes Sixt <j.sixt@viscovery.net>,
Matt McClure <matthewlmcclure@gmail.com>,
Junio C Hamano <gitster@pobox.com>,
David Aguilar <davvid@gmail.com>,
Sitaram Chamarty <sitaramc@gmail.com>,
Jonathan Nieder <jrnieder@gmail.com>,
John Keeping <john@keeping.me.uk>
Subject: [PATCH 1/5] t7800: move '--symlinks' specific test to the end
Date: Fri, 29 Mar 2013 11:28:32 +0000 [thread overview]
Message-ID: <279dbdc3072772961ce28a90ffa0a7d8df017ffe.1364555970.git.john@keeping.me.uk> (raw)
In-Reply-To: <cover.1364555970.git.john@keeping.me.uk>
In-Reply-To: <cover.1364555970.git.john@keeping.me.uk>
This will group the tests more logically when we introduce a helper to
run most --dir-diff tests with both --symlinks and --no-symlinks.
Signed-off-by: John Keeping <john@keeping.me.uk>
---
t/t7800-difftool.sh | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh
index c6d6b1c..e6a16cd 100755
--- a/t/t7800-difftool.sh
+++ b/t/t7800-difftool.sh
@@ -340,6 +340,21 @@ test_expect_success PERL 'difftool --dir-diff' '
stdin_contains file <output
'
+test_expect_success PERL 'difftool --dir-diff ignores --prompt' '
+ git difftool --dir-diff --prompt --extcmd ls branch >output &&
+ stdin_contains sub <output &&
+ stdin_contains file <output
+'
+
+test_expect_success PERL 'difftool --dir-diff from subdirectory' '
+ (
+ cd sub &&
+ git difftool --dir-diff --extcmd ls branch >output &&
+ stdin_contains sub <output &&
+ stdin_contains file <output
+ )
+'
+
write_script .git/CHECK_SYMLINKS <<\EOF
for f in file file2 sub/sub
do
@@ -362,19 +377,4 @@ test_expect_success PERL,SYMLINKS 'difftool --dir-diff --symlink without unstage
test_cmp actual expect
'
-test_expect_success PERL 'difftool --dir-diff ignores --prompt' '
- git difftool --dir-diff --prompt --extcmd ls branch >output &&
- stdin_contains sub <output &&
- stdin_contains file <output
-'
-
-test_expect_success PERL 'difftool --dir-diff from subdirectory' '
- (
- cd sub &&
- git difftool --dir-diff --extcmd ls branch >output &&
- stdin_contains sub <output &&
- stdin_contains file <output
- )
-'
-
test_done
--
1.8.2.411.g65a544e
next prev parent reply other threads:[~2013-03-29 11:29 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-29 11:28 [PATCH 0/5] difftool improvements John Keeping
2013-03-29 11:28 ` John Keeping [this message]
2013-03-29 11:28 ` [PATCH 2/5] difftool: don't overwrite modified files John Keeping
2013-03-29 20:20 ` Junio C Hamano
2013-03-29 21:38 ` John Keeping
2013-03-29 22:07 ` [PATCH 2/5 v2] " John Keeping
2013-03-29 11:28 ` [PATCH 3/5] t7800: don't hide grep output John Keeping
2013-03-29 11:28 ` [PATCH 4/5] t7800: fix tests when difftool uses --no-symlinks John Keeping
2013-03-29 11:28 ` [PATCH 5/5] t7800: run --dir-diff tests with and without symlinks John Keeping
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=279dbdc3072772961ce28a90ffa0a7d8df017ffe.1364555970.git.john@keeping.me.uk \
--to=john@keeping.me.uk \
--cc=davvid@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j.sixt@viscovery.net \
--cc=jrnieder@gmail.com \
--cc=matthewlmcclure@gmail.com \
--cc=sitaramc@gmail.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).