[PATCH 1/5] t7800: move '--symlinks' specific test to the end
flat view
DORMANTno replies
From: John Keeping <hidden>
Date: 2016-06-15 22:56:34
Subsystem:
the rest · Maintainer:
Linus Torvalds
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 <redacted> --- 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